From: Matthias H <apoc@sixserv.org>
Date: Mon, 12 Jan 2015 11:02:21 +0000 (+0100)
Subject: web service: fix basic auth handler
X-Git-Url: https://git.netwichtig.de/gitweb/?a=commitdiff_plain;h=592c800425410f63b1a6ebf467d32273ccd377b4;hp=c5ee1de18a464075f00b6f348d494302f751e5e5;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

web service: fix basic auth handler
---

diff --git a/lib/rbot/core/webservice.rb b/lib/rbot/core/webservice.rb
index c3e61f49..c823594a 100644
--- a/lib/rbot/core/webservice.rb
+++ b/lib/rbot/core/webservice.rb
@@ -73,8 +73,9 @@ class Bot
             if botuser and botuser.password == password
               @source = botuser
               true
+            else
+              false
             end
-            false
           else
             true # no need to request auth at this point
           end
@@ -351,6 +352,11 @@ class DispatchServlet < WEBrick::HTTPServlet::AbstractServlet
     begin
       m = WebMessage.new(@bot, req, res)
       @bot.web_dispatcher.handle m
+    rescue WEBrick::HTTPStatus::Unauthorized
+      res.status = 401
+      res['Content-Type'] = 'text/plain'
+      res.body = 'Authentication Required!'
+      error 'authentication error (wrong password)'
     rescue
       res.status = 500
       res['Content-Type'] = 'text/plain'