X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=data%2Frbot%2Fplugins%2Fwserver.rb;h=b9260170b4997d4d71352145983ce0279cc29b07;hb=052217de30c59206d7025b582d4604557a747470;hp=fdb4207dfe1d005ba021d04ca8cccc12c4e2facc;hpb=b11c3c4042b03e36639370002ecf86c44f7ddde4;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git diff --git a/data/rbot/plugins/wserver.rb b/data/rbot/plugins/wserver.rb index fdb4207d..b9260170 100644 --- a/data/rbot/plugins/wserver.rb +++ b/data/rbot/plugins/wserver.rb @@ -1,7 +1,3 @@ -require 'net/http' -require 'uri' -Net::HTTP.version_1_2 - class WserverPlugin < Plugin def help(plugin, topic="") "wserver => try and determine what webserver is using" @@ -16,20 +12,20 @@ class WserverPlugin < Plugin m.reply "cowardly refusing to follow more than 3 redirects" return end - + begin uri = URI.parse(hostname) rescue URI::InvalidURIError => err m.reply "#{hostname} is not a valid URI" return end - + unless(uri) m.reply "incorrect usage: " + help(m.plugin) return end - - + + resp = @bot.httputil.head(uri) server = resp['Server'] if(server && server.length > 0) @@ -38,7 +34,7 @@ class WserverPlugin < Plugin m.reply "couldn't tell what #{uri.host} is running" end - if(resp.code == "302" || resp.code == "301") + if(resp.code == "302" || resp.code == "301") newloc = resp['location'] newuri = URI.parse(newloc) # detect and ignore incorrect redirects (to relative paths etc)