X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=lib%2Frbot%2Fbotuser.rb;h=cc9e01a58f2608b996a436f83f50f2bbece89d56;hb=93f55f799384a19d7c036624b0e7886f9d095e02;hp=5cb05f1734d09523ff5be54b04b03b5be10d5822;hpb=135677d487beedb5d66274bcafb0db227e8865fb;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

diff --git a/lib/rbot/botuser.rb b/lib/rbot/botuser.rb
index 5cb05f17..cc9e01a5 100644
--- a/lib/rbot/botuser.rb
+++ b/lib/rbot/botuser.rb
@@ -21,18 +21,18 @@ module Irc
       :default => 'rbotauth', :wizard => true,
       :desc => 'Password for the bot owner' )
     BotConfig.register BotConfigBooleanValue.new( 'auth.login_by_mask',
-      :default => 'false',
-      :desc => 'Set true if new botusers should allow logging in without a password when the user netmask is known')
-    BotConfig.register BotConfigBooleanValue.new( 'auth.login_auto',
-      :default => 'false',
-      :desc => 'Set true if new botusers should try to recognize IRC users without a need to manually login')
+      :default => 'true',
+      :desc => 'Set false to prevent new botusers from logging in without a password when the user netmask is known')
+    BotConfig.register BotConfigBooleanValue.new( 'auth.autologin',
+      :default => 'true',
+      :desc => 'Set false to prevent new botusers from recognizing IRC users without a need to manually login')
     # BotConfig.register BotConfigIntegerValue.new( 'auth.default_level',
     #   :default => 10, :wizard => true,
     #   :desc => 'The default level for new/unknown users' )
 
     # Generate a random password of length _l_
     #
-    def random_password(l=8)
+    def Auth.random_password(l=8)
       pwd = ""
       8.times do
         pwd += (rand(26) + (rand(2) == 0 ? 65 : 97) ).chr
@@ -110,6 +110,7 @@ module Irc
     # This class describes a permission set
     class PermissionSet
 
+      attr_reader :perm
       # Create a new (empty) PermissionSet
       #
       def initialize
@@ -167,6 +168,7 @@ module Irc
       attr_reader :username
       attr_reader :password
       attr_reader :netmasks
+      attr_reader :perm
       attr_writer :login_by_mask
       attr_writer :autologin
 
@@ -176,8 +178,8 @@ module Irc
         @password = nil
         @netmasks = NetmaskList.new
         @perm = {}
-        @login_by_mask = Auth.manager.bot.config['auth.login_by_mask'] unless defined?(@login_by_mask)
-        @autologin = Auth.manager.bot.config['auth.login_auto'] unless defined?(@autologin)
+        reset_login_by_mask
+        reset_autologin
       end
 
       # Inspection
@@ -209,6 +211,18 @@ module Irc
         @login_by_mask
       end
 
+      # Reset the login-by-mask option
+      #
+      def reset_login_by_mask
+        @login_by_mask = Auth.authmanager.bot.config['auth.login_by_mask'] unless defined?(@login_by_mask)
+      end
+
+      # Reset the autologin option
+      #
+      def reset_autologin
+        @autologin = Auth.authmanager.bot.config['auth.autologin'] unless defined?(@autologin)
+      end
+
       # Do we allow automatic logging in?
       #
       def autologin?
@@ -245,7 +259,7 @@ module Irc
 
       # Resets the password by creating a new onw
       def reset_password
-        @password = random_password
+        @password = Auth.random_password
       end
 
       # Sets the permission for command _cmd_ to _val_ on channel _chan_
@@ -293,7 +307,7 @@ module Irc
 
       # Removes all <code>Netmask</code>s
       #
-      def reset_netmask_list
+      def reset_netmasks
         @netmasks = NetmaskList.new
       end
 
@@ -316,7 +330,7 @@ module Irc
       # is right. If it is, the Netmask of the user is added to the
       # list of acceptable Netmask unless it's already matched.
       def login(user, password)
-        if password == @password or (@password.nil? and @login_by_mask and knows?(user))
+        if password == @password or (password.nil? and (@login_by_mask || @autologin) and knows?(user))
           add_netmask(user) unless knows?(user)
           debug "#{user} logged in as #{self.inspect}"
           return true
@@ -334,7 +348,9 @@ module Irc
       # and replacing any nonalphanumeric character with _
       #
       def BotUser.sanitize_username(name)
-        return name.to_s.chomp.downcase.gsub(/[^a-z0-9]/,"_")
+        candidate = name.to_s.chomp.downcase.gsub(/[^a-z0-9]/,"_")
+        raise "sanitized botusername #{candidate} too short" if candidate.length < 3
+        return candidate
       end
 
     end
@@ -345,16 +361,15 @@ module Irc
     #
     class DefaultBotUserClass < BotUser
 
-      private :login, :add_netmask, :delete_netmask
+      private :add_netmask, :delete_netmask
 
       include Singleton
 
-      # The default BotUser is named 'everyone', it doesn't allow autologin
-      # (meaningless) and it allows login-by-mask
+      # The default BotUser is named 'everyone'
       #
       def initialize
-        @login_by_mask = true
-        @autologin = false
+        reset_login_by_mask
+        reset_autologin
         super("everyone")
         @default_perm = PermissionSet.new
       end
@@ -366,6 +381,12 @@ module Irc
         return @login_by_mask
       end
 
+      # The default botuser allows logins by mask
+      #
+      def reset_login_by_mask
+        @login_by_mask = true
+      end
+
       # This method returns without changing anything
       #
       def autologin=(val)
@@ -373,6 +394,12 @@ module Irc
         return
       end
 
+      # The default botuser doesn't allow autologin (meaningless)
+      #
+      def reset_autologin
+        @autologin = false
+      end
+
       # Sets the default permission for the default user (i.e. the ones
       # set by the BotModule writers) on all channels
       #
@@ -393,7 +420,7 @@ module Irc
       end
 
       # Resets the NetmaskList
-      def reset_netmask_list
+      def reset_netmasks
         super
         add_netmask("*!*@*")
       end
@@ -426,7 +453,7 @@ module Irc
 
       def initialize
         @login_by_mask = false
-        @autologin = false
+        @autologin = true
         super("owner")
       end
 
@@ -452,6 +479,7 @@ module Irc
 
       attr_reader :everyone
       attr_reader :botowner
+      attr_reader :bot
 
       # The instance manages two <code>Hash</code>es: one that maps
       # <code>Irc::User</code>s onto <code>BotUser</code>s, and the other that maps
@@ -523,18 +551,20 @@ module Irc
 
       # Maps <code>Irc::User</code> to BotUser
       def irc_to_botuser(ircuser)
-        # TODO check netmasks
-        @botusers[ircuser.to_irc_user] || everyone
+        logged = @botusers[ircuser.to_irc_user]
+        return logged if logged
+        return autologin(ircuser)
       end
 
       # creates a new BotUser
       def create_botuser(name, password=nil)
         n = BotUser.sanitize_username(name)
         k = n.to_sym
-        raise "BotUser #{n} exists" if include?(k)
+        raise "botuser #{n} exists" if include?(k)
         bu = BotUser.new(n)
         bu.password = password
         @allbotusers[k] = bu
+        return bu
       end
 
       # returns the botuser with name _name_
@@ -548,13 +578,13 @@ module Irc
       #
       # It is possible to autologin by Netmask, on request
       #
-      def login(user, botusername, pwd)
+      def login(user, botusername, pwd=nil)
         ircuser = user.to_irc_user
         n = BotUser.sanitize_username(botusername)
         k = n.to_sym
         raise "No such BotUser #{n}" unless include?(k)
         if @botusers.has_key?(ircuser)
-          return true if @botusers[ircuser].name = n
+          return true if @botusers[ircuser].username = n
           # TODO
           # @botusers[ircuser].logout(ircuser)
         end
@@ -590,7 +620,11 @@ module Irc
       # * everyone on all channels
       #
       def permit?(user, cmdtxt, channel=nil)
-        botuser = irc_to_botuser(user)
+        if user.class <= BotUser
+          botuser = user
+        else
+          botuser = irc_to_botuser(user)
+        end
         cmd = cmdtxt.to_irc_auth_command
 
         chan = channel