X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=lib%2Frbot%2Fbotuser.rb;h=d859e9c3f3f1d74e963e4a248f533ef9d8204da4;hb=c4502412f30f69c1ffa053b160e01d3974b338aa;hp=b88ffc81f3312a1ab494828a5c7b73ae2cb3d656;hpb=e69bc8cd5ef9a7a40ff88a49aa4dcda9a6f56c83;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git
diff --git a/lib/rbot/botuser.rb b/lib/rbot/botuser.rb
index b88ffc81..d859e9c3 100644
--- a/lib/rbot/botuser.rb
+++ b/lib/rbot/botuser.rb
@@ -19,13 +19,13 @@ module Irc
BotConfig.register BotConfigStringValue.new( 'auth.password',
:default => 'rbotauth', :wizard => true,
- :desc => 'Password for the bot owner' )
+ :desc => _('Password for the bot owner'))
BotConfig.register BotConfigBooleanValue.new( 'auth.login_by_mask',
:default => 'true',
- :desc => 'Set false to prevent new botusers from logging in without a password when the user netmask is known')
+ :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')
+ :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' )
@@ -34,8 +34,8 @@ module Irc
#
def Auth.random_password(l=8)
pwd = ""
- 8.times do
- pwd += (rand(26) + (rand(2) == 0 ? 65 : 97) ).chr
+ l.times do
+ pwd << (rand(26) + (rand(2) == 0 ? 65 : 97) ).chr
end
return pwd
end
@@ -76,7 +76,7 @@ module Irc
k.to_sym
}
@command = path.last
- debug "Created command #{@command.inspect} with path #{@path.join(', ')}"
+ debug "Created command #{@command.inspect} with path #{@path.pretty_inspect}"
end
# Returs self
@@ -101,6 +101,16 @@ class String
end
+class Symbol
+
+ # Returns an Irc::Auth::Comand from the receiver
+ def to_irc_auth_command
+ Irc::Auth::Command.new(self)
+ end
+
+end
+
+
module Irc
@@ -110,6 +120,7 @@ module Irc
# This class describes a permission set
class PermissionSet
+ attr_reader :perm
# Create a new (empty) PermissionSet
#
def initialize
@@ -159,6 +170,12 @@ module Irc
end
+ # This is the error that gets raised when an invalid password is met
+ #
+ class InvalidPassword < RuntimeError
+ end
+
+
# This is the basic class for bot users: they have a username, a password,
# a list of netmasks to match against, and a list of permissions.
#
@@ -167,6 +184,7 @@ module Irc
attr_reader :username
attr_reader :password
attr_reader :netmasks
+ attr_reader :perm
attr_writer :login_by_mask
attr_writer :autologin
@@ -191,6 +209,11 @@ module Irc
str << ">"
end
+ # In strings
+ def to_s
+ @username
+ end
+
# Convert into a hash
def to_hash
{
@@ -212,13 +235,13 @@ module Irc
# Reset the login-by-mask option
#
def reset_login_by_mask
- @login_by_mask = Auth.manager.bot.config['auth.login_by_mask'] unless defined?(@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.manager.bot.config['auth.autologin'] unless defined?(@autologin)
+ @autologin = Auth.authmanager.bot.config['auth.autologin'] unless defined?(@autologin)
end
# Do we allow automatic logging in?
@@ -240,18 +263,19 @@ module Irc
# This method sets the password if the proposed new password
# is valid
def password=(pwd=nil)
- if pwd
+ pass = pwd.to_s
+ if pass.empty?
+ reset_password
+ else
begin
- raise InvalidPassword, "#{pwd} contains invalid characters" if pwd !~ /^[A-Za-z0-9]+$/
- raise InvalidPassword, "#{pwd} too short" if pwd.length < 4
- @password = pwd
+ raise InvalidPassword, "#{pass} contains invalid characters" if pass !~ /^[\x21-\x7e]+$/
+ raise InvalidPassword, "#{pass} too short" if pass.length < 4
+ @password = pass
rescue InvalidPassword => e
raise e
rescue => e
- raise InvalidPassword, "Exception #{e.inspect} while checking #{pwd}"
+ raise InvalidPassword, "Exception #{e.inspect} while checking #{pass.inspect} (#{pwd.inspect})"
end
- else
- reset_password
end
end
@@ -346,7 +370,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
@@ -357,7 +383,7 @@ module Irc
#
class DefaultBotUserClass < BotUser
- private :login, :add_netmask, :delete_netmask
+ private :add_netmask, :delete_netmask
include Singleton
@@ -401,7 +427,7 @@ module Irc
#
def set_default_permission(cmd, val)
@default_perm.set_permission(Command.new(cmd), val)
- debug "Default permissions now:\n#{@default_perm.inspect}"
+ debug "Default permissions now: #{@default_perm.pretty_inspect}"
end
# default knows everybody
@@ -475,6 +501,7 @@ module Irc
attr_reader :everyone
attr_reader :botowner
+ attr_reader :bot
# The instance manages two Hash
es: one that maps
# Irc::User
s onto BotUser
s, and the other that maps
@@ -520,6 +547,10 @@ module Irc
end
def load_array(ary, forced)
+ unless ary
+ warn "Tried to load an empty array"
+ return
+ end
raise "Won't load with unsaved changes" if @has_changes and not forced
reset_hashes
ary.each { |x|
@@ -555,10 +586,11 @@ module Irc
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_
@@ -578,7 +610,7 @@ module Irc
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
@@ -646,9 +678,19 @@ module Irc
raise "Could not check permission for user #{user.inspect} to run #{cmdtxt.inspect} on #{chan.inspect}"
end
- # Checks if command _cmd_ is allowed to User _user_ on _chan_
+ # Checks if command _cmd_ is allowed to User _user_ on _chan_, optionally
+ # telling if the user is authorized
+ #
def allow?(cmdtxt, user, chan=nil)
- permit?(user, cmdtxt, chan)
+ if permit?(user, cmdtxt, chan)
+ return true
+ else
+ # cmds = cmdtxt.split('::')
+ # @bot.say chan, "you don't have #{cmds.last} (#{cmds.first}) permissions here" if chan
+ @bot.say chan, _("%{user}, you don't have '%{command}' permissions here") %
+ {:user=>user, :command=>cmdtxt} if chan
+ return false
+ end
end
end