anidb: Try to get (*AniDB).User() from the cache if it's unset

[go-anidb.git] / auth.go

diff --git a/auth.go b/auth.go
index a4058a9854643e30e1ac2f27b06b3218a5a0499d..6e4af5a83f4917c97d71854f0d21b2aeb5a2fbba 100644 (file)
--- a/auth.go
+++ b/auth.go
@@ -4,7 +4,7 @@ import (
        "crypto/aes"
        "crypto/cipher"
        "crypto/rand"
-       "errors"
+       "github.com/Kovensky/go-anidb/udp"
        "io"
        "runtime"
 )
@@ -83,23 +83,68 @@ func newCredentials(username, password, udpKey string) *credentials {
        }
 }
 
-func (udp *udpWrap) ReAuth() error {
-       if c := udp.credentials; c != nil {
-               defer runtime.GC() // any better way to clean the plaintexts?
+func (udp *udpWrap) ReAuth() udpapi.APIReply {
+       if Banned() {
+               return bannedReply
+       }
+
+       udp.credLock.Lock()
+       defer udp.credLock.Unlock()
 
-               udp.connected = true
-               return udp.Auth(
+       if c := udp.credentials; c != nil {
+               logRequest(paramSet{cmd: "AUTH", params: paramMap{"user": decrypt(c.username)}})
+               r := udp.AniDBUDP.Auth(
                        decrypt(c.username),
                        decrypt(c.password),
                        decrypt(c.udpKey))
+               logReply(r)
+
+               err := r.Error()
+
+               if err != nil {
+                       switch r.Code() {
+                       // 555 -- banned
+                       // 601 -- server down, treat the same as a ban
+                       case 555, 601:
+                               setBanned()
+                       case 500: // bad credentials
+                               udp.credentials.shred()
+                               udp.credentials = nil
+                       case 503, 504: // client rejected
+                               panic(err)
+                       }
+               }
+               udp.connected = err == nil
+
+               if udp.connected {
+                       // We can't use SendRecv here as it would deadlock
+                       ch := make(chan udpapi.APIReply, 1)
+                       udp.sendQueueCh <- paramSet{
+                               cmd:    "USER",
+                               params: paramMap{"user": decrypt(c.username)},
+                               ch:     ch,
+                       }
+                       reply := <-ch
+
+                       if reply != nil {
+                               uid, _ := parseUserReply(reply)
+                               udp.user = uid.User()
+                       }
+               }
+
+               runtime.GC()
+               return r
        }
-       return errors.New("No credentials stored")
+       return &noauthAPIReply{}
 }
 
 // Saves the used credentials in the AniDB struct, to allow automatic
 // re-authentication when needed; they are (properly) encrypted with a key that's
 // uniquely generated every time the module is initialized.
 func (adb *AniDB) SetCredentials(username, password, udpKey string) {
+       adb.udp.credLock.Lock()
+       defer adb.udp.credLock.Unlock()
+
        adb.udp.credentials.shred()
        adb.udp.credentials = newCredentials(username, password, udpKey)
 }
@@ -110,20 +155,33 @@ func (adb *AniDB) SetCredentials(username, password, udpKey string) {
 func (adb *AniDB) Auth(username, password, udpKey string) (err error) {
        defer runtime.GC() // any better way to clean the plaintexts?
 
-       if err = adb.udp.Auth(username, password, udpKey); err == nil {
-               adb.udp.connected = true
+       adb.udp.sendLock.Lock()
+       defer adb.udp.sendLock.Unlock()
+
+       if !Banned() {
                adb.SetCredentials(username, password, udpKey)
        }
-       return
+
+       // ReAuth clears the credentials if they're bad
+       return adb.udp.ReAuth().Error()
 }
 
 // Logs the user out and removes the credentials from the AniDB struct.
 func (adb *AniDB) Logout() error {
+       adb.udp.credLock.Lock()
+       defer adb.udp.credLock.Unlock()
+
        adb.udp.credentials.shred()
        adb.udp.credentials = nil
 
+       adb.udp.sendLock.Lock()
+       defer adb.udp.sendLock.Unlock()
+
+       adb.udp.user = nil
+
        if adb.udp.connected {
                adb.udp.connected = false
+               logRequest(paramSet{cmd: "LOGOUT"})
                return adb.udp.Logout()
        }
        return nil