register command implemented

diff --git a/bot.tcl b/bot.tcl
index 42f062757f48a2ba8971bdf8b4429df34eb80dd0..967b095dbf8575b15b70f3c5a2a71f23d61736ee 100755 (executable)
--- a/bot.tcl
+++ b/bot.tcl
@@ -15,6 +15,29 @@ if {![info exists globalsecret]} {
     unset gsfile
 }
 
+proc try_except_finally {try except finally} {
+    global errorInfo errorCode
+    set er [catch { uplevel 1 $try } emsg]
+    if {$er} {
+       set ei $errorInfo
+       set ec $errorCode
+       if {[catch { uplevel 1 $except } emsg3]} {
+           append ei "\nALSO ERROR HANDLING ERROR:\n$emsg3"
+       }
+    }
+    set er2 [catch { uplevel 1 $finally } emsg2]
+    if {$er} {
+       if {$er2} {
+           append ei "\nALSO ERROR CLEANING UP:\n$emsg2"
+       }
+       return -code $er -errorinfo $ei -errorcode $ec $emsg
+    } elseif {$er2} {
+       return -code $er2 -errorinfo $errorInfo -errorcode $errorCode $emsg2
+    } else {
+       return $emsg
+    }
+}
+
 proc sendout {command args} {
     global sock
     if {[llength $args]} {
@@ -402,14 +425,14 @@ proc msg_PRIVMSG {p c dest text} {
        sendprivmsg $n "error: $rv"
     } else {
        manyset $rv priv_msgs pub_msgs priv_acts pub_acts
-       foreach {td val} [list $n $priv_msgs $output $pub_msgs] {
+       foreach {td val} [list $n $priv_acts $output $pub_acts] {
            foreach l [split $val "\n"] {
-               sendprivmsg $td $l
+               sendaction $td $l
            }
        }
-       foreach {td val} [list $n $priv_acts $output $pub_acts] {
+       foreach {td val} [list $n $priv_msgs $output $pub_msgs] {
            foreach l [split $val "\n"] {
-               sendaction $td $l
+               sendprivmsg $td $l
            }
        }
     }
@@ -541,21 +564,138 @@ proc check_username {target} {
     } { error "invalid username" }
 }
 
+proc nickdb__head {} {
+    uplevel 1 {
+       set nl [irctolower $n]
+       upvar #0 nickdb($nl) ndbe
+       binary scan $nl H* nh
+       set nfn users/$nh
+       if {![info exists ndbe] && [file exists $nfn]} {
+           set f [file open $nfn r]
+           try_except_finally { set newval [read $f] } {} { close $f }
+           if {[llength $newval] % 2} { error "invalid length" }
+           set ndbe $newval
+       }
+    }
+}
+
+proc def_nickdb {name arglist body} {
+    proc nickdb_$name $arglist "nickdb__head; $body"
+}
+
+def_nickdb exists {n} {
+    return [info exists ndbe]
+}
+
+def_nickdb delete {n} {
+    catch { unset ndbe }
+    file delete $nfn
+}
+
+set default_settings {timeformat ks}
+
+def_nickdb set {n args} {
+    global default_settings
+    if {![info exists ndbe]} { set ndbe $default_settings }
+    foreach {key value} [concat $ndbe $args] { set a($key) $value }
+    set newval {}
+    foreach {key value} [array get a] { lappend newval $key $value }
+    set f [open $nfn.new w]
+    try_except_finally {
+       puts $f $newval
+       close $f
+       file rename -force $nfn.new $nfn
+    } {
+       catch { close $f }
+    } {
+    }
+    set ndbe $newval
+}
+
+def_nickdb opt {n key} {
+    global default_settings
+    if {[info exists ndbe]} {
+       set l $ndbe
+    } else {
+       set l $default_settings
+    }
+    foreach {tkey value} $l {
+       if {"$tkey" == "$key"} { return $value }
+    }
+    error "unset setting $key"
+}
+
+proc check_notonchan {} {
+    upvar 1 dest dest
+    if {[ischan $dest]} { error "that command must be sent privately" }
+}
+
+proc nick_securitycheck {strict} {
+    upvar 1 n n
+    if {![nickdb_exists $n]} { error "you are unknown to me, use `register'." }
+    set wantu [nickdb_opt $n username]
+    if {![string length $wantu]} {
+       if {$strict} {
+           error "that feature is only available to secure users, sorry."
+       } else {
+           return
+       }
+    }
+    upvar #0 nick_username($n) nu
+    if {![info exists nu]} {
+       error "nick $n is secure, you must identify yourself first."
+    }
+    if {"$wantu" != "$nu"} {
+       error "you are the wrong user - the nick $n belongs to $wantu, not $nu"
+    }
+}
+
+def_ucmd register {
+    prefix_nick
+    check_notonchan
+    set old [nickdb_exists $n]
+    if {$old} { nick_securitycheck 0 }
+    switch -exact [string tolower [string trim $text]] {
+       {} {
+           upvar #0 nick_username($n) nu
+           if {![info exists nu]} {
+               ucmdr {} \
+ "You must identify yourself before using `register'.  See `help identify'."
+           }
+           nickdb_set $n username $nu
+           ucmdr {} {} "makes a note of your username." {}
+       }
+       delete {
+           nickdb_delete $n
+           ucmdr {} {} "forgets your nickname." {}
+       }
+       insecure {
+           nickdb_set $n username {}
+           if {$old} {
+               ucmdr {} "Security is now disabled for your nickname !"
+           } else {
+               ucmdr {} "This is fine, but bear in mind that people will be able to mess with your settings.  Channel management features need a secure registration." "makes an insecure registration for your nick."
+           }
+       }
+    }
+}          
+
 def_ucmd identpass {
     set username [ta_word]
     set passmd5 [md5sum [ta_word]]
     ta_nomore
     prefix_nick
+    check_isprivmsg
     upvar #0 nick_onchans($n) onchans
     if {![info exists onchans] || ![llength $onchans]} {
-       ucmdr {} "You must be on a channel with me to identify yourself."
+       ucmdr "You must be on a channel with me to identify yourself." {}
     }
     check_username $username
     exec userv --timeout 3 $username << "$passmd5\n" > /dev/null \
            irc-identpass $n
     upvar #0 nick_username($n) rec_username
     set rec_username $username
-    ucmdr {} "Pleased to see you, $username."
+    ucmdr "Pleased to see you, $username." {}
 }
 
 def_ucmd summon {

diff --git a/helpinfos b/helpinfos
index d6da2a035fbcc8a9aab2c3bc9200b80120fcc520..e1ef082d18ab480cc280029d1ce3932704c40683 100644 (file)
--- a/helpinfos
+++ b/helpinfos
@@ -35,8 +35,8 @@ convert <number> <unit>
 !ops
 ops             on channel
 ops <channel>   (privately)
- Asks me to give you channel operator privilege.  You must have
- identified yourself (see `help identification').
+ Asks me to give you channel operator privilege.  You must be using
+ a secure nick and have identified yourself (see `help identify').
 
 !oplist
 oplist [<chan>]                      show chop list