New auth framework is now backwards compatible: auth <masterpassword> works again...

[user/henk/code/ruby/rbot.git] / lib / rbot / botuser.rb

diff --git a/lib/rbot/botuser.rb b/lib/rbot/botuser.rb
index b88ffc81f3312a1ab494828a5c7b73ae2cb3d656..41fca6cf9847316cd0d071826a0a5f36b2ee08eb 100644 (file)
--- a/lib/rbot/botuser.rb
+++ b/lib/rbot/botuser.rb
@@ -110,6 +110,7 @@ module Irc
     # This class describes a permission set\r
     class PermissionSet\r
 \r
+      attr_reader :perm\r
       # Create a new (empty) PermissionSet\r
       #\r
       def initialize\r
@@ -159,6 +160,12 @@ module Irc
     end\r
 \r
 \r
+    # This is the error that gets raised when an invalid password is met\r
+    #\r
+    class InvalidPassword < RuntimeError\r
+    end\r
+\r
+\r
     # This is the basic class for bot users: they have a username, a password,\r
     # a list of netmasks to match against, and a list of permissions.\r
     #\r
@@ -167,6 +174,7 @@ module Irc
       attr_reader :username\r
       attr_reader :password\r
       attr_reader :netmasks\r
+      attr_reader :perm\r
       attr_writer :login_by_mask\r
       attr_writer :autologin\r
 \r
@@ -191,6 +199,11 @@ module Irc
         str << ">"\r
       end\r
 \r
+      # In strings\r
+      def to_s\r
+        @username\r
+      end\r
+\r
       # Convert into a hash\r
       def to_hash\r
         {\r
@@ -212,13 +225,13 @@ module Irc
       # Reset the login-by-mask option\r
       #\r
       def reset_login_by_mask\r
-        @login_by_mask = Auth.manager.bot.config['auth.login_by_mask'] unless defined?(@login_by_mask)\r
+        @login_by_mask = Auth.authmanager.bot.config['auth.login_by_mask'] unless defined?(@login_by_mask)\r
       end\r
 \r
       # Reset the autologin option\r
       #\r
       def reset_autologin\r
-        @autologin = Auth.manager.bot.config['auth.autologin'] unless defined?(@autologin)\r
+        @autologin = Auth.authmanager.bot.config['auth.autologin'] unless defined?(@autologin)\r
       end\r
 \r
       # Do we allow automatic logging in?\r
@@ -346,7 +359,9 @@ module Irc
       # and replacing any nonalphanumeric character with _\r
       #\r
       def BotUser.sanitize_username(name)\r
-        return name.to_s.chomp.downcase.gsub(/[^a-z0-9]/,"_")\r
+        candidate = name.to_s.chomp.downcase.gsub(/[^a-z0-9]/,"_")\r
+        raise "sanitized botusername #{candidate} too short" if candidate.length < 3\r
+        return candidate\r
       end\r
 \r
     end\r
@@ -357,7 +372,7 @@ module Irc
     #\r
     class DefaultBotUserClass < BotUser\r
 \r
-      private :login, :add_netmask, :delete_netmask\r
+      private :add_netmask, :delete_netmask\r
 \r
       include Singleton\r
 \r
@@ -475,6 +490,7 @@ module Irc
 \r
       attr_reader :everyone\r
       attr_reader :botowner\r
+      attr_reader :bot\r
 \r
       # The instance manages two <code>Hash</code>es: one that maps\r
       # <code>Irc::User</code>s onto <code>BotUser</code>s, and the other that maps\r
@@ -555,10 +571,11 @@ module Irc
       def create_botuser(name, password=nil)\r
         n = BotUser.sanitize_username(name)\r
         k = n.to_sym\r
-        raise "BotUser #{n} exists" if include?(k)\r
+        raise "botuser #{n} exists" if include?(k)\r
         bu = BotUser.new(n)\r
         bu.password = password\r
         @allbotusers[k] = bu\r
+        return bu\r
       end\r
 \r
       # returns the botuser with name _name_\r
@@ -578,7 +595,7 @@ module Irc
         k = n.to_sym\r
         raise "No such BotUser #{n}" unless include?(k)\r
         if @botusers.has_key?(ircuser)\r
-          return true if @botusers[ircuser].name = n\r
+          return true if @botusers[ircuser].username == n\r
           # TODO\r
           # @botusers[ircuser].logout(ircuser)\r
         end\r
@@ -646,9 +663,18 @@ module Irc
         raise "Could not check permission for user #{user.inspect} to run #{cmdtxt.inspect} on #{chan.inspect}"\r
       end\r
 \r
-      # Checks if command _cmd_ is allowed to User _user_ on _chan_\r
+      # Checks if command _cmd_ is allowed to User _user_ on _chan_, optionally\r
+      # telling if the user is authorized\r
+      #\r
       def allow?(cmdtxt, user, chan=nil)\r
-        permit?(user, cmdtxt, chan)\r
+        if permit?(user, cmdtxt, chan)\r
+          return true\r
+        else\r
+          # cmds = cmdtxt.split('::')\r
+          # @bot.say chan, "you don't have #{cmds.last} (#{cmds.first}) permissions here" if chan\r
+          @bot.say chan, "#{user}, you don't have '#{cmdtxt}' permissions here" if chan\r
+          return false\r
+        end\r
       end\r
 \r
     end\r