Specify the type of authorization info

andeya · Jan 23, 2018 · 3553eba · 3553eba
1 parent 2bb4673
commit 3553eba
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 13 deletions.
diff --git a/plugin/auth.go b/plugin/auth.go
@@ -61,16 +61,14 @@ func (a *auth) Name() string {
 }
 
 func (a *auth) PostDial(sess tp.EarlySession) *tp.Rerror {
-	rerr := sess.Send(authURI, a.generateAuthInfoFunc(), nil)
+	rerr := sess.Send(authURI, a.generateAuthInfoFunc(), nil, socket.WithBodyCodec('s'))
 	if rerr != nil {
 		return rerr
 	}
-
 	_, rerr = sess.Receive(func(header socket.Header) interface{} {
 		return nil
 	})
-
-	return nil
+	return rerr
 }
 
 func (a *auth) PostAccept(sess tp.EarlySession) *tp.Rerror {
@@ -83,14 +81,11 @@ func (a *auth) PostAccept(sess tp.EarlySession) *tp.Rerror {
 	if rerr != nil {
 		return rerr
 	}
-
 	if input.Uri() != authURI {
-		return tp.NewRerror(tp.CodeBadPacket, tp.CodeText(tp.CodeBadPacket), "Received an unexecepted response: "+input.Uri())
+		return tp.NewRerror(tp.CodeBadPacket, tp.CodeText(tp.CodeBadPacket), "received an unexecepted response: "+input.Uri())
 	}
-
 	authInfo := *input.Body().(*string)
 	rerr = a.verifyAuthInfoFunc(authInfo, sess)
-
 	rerr2 := sess.Send(authURI, nil, rerr)
 	if rerr == nil {
 		rerr = rerr2

diff --git a/samples/auth/client.go b/samples/auth/client.go
@@ -8,13 +8,13 @@ import (
 func main() {
 	cli := tp.NewPeer(tp.PeerConfig{}, plugin.LaunchAuth(generateAuthInfo))
 	defer cli.Close()
-	_, e := cli.Dial(":9090")
-	if e != nil {
-		tp.Fatalf("%v", e)
+	_, rerr := cli.Dial(":9090")
+	if rerr != nil {
+		tp.Fatalf("%v", rerr)
 	}
 }
 
-const clientAuthInfo = "client auth info"
+const clientAuthInfo = "client-auth-info-12345"
 
 func generateAuthInfo() string {
 	tp.Infof("generate auth info: %s", clientAuthInfo)

diff --git a/samples/auth/server.go b/samples/auth/server.go
@@ -13,7 +13,7 @@ func main() {
 }
 
 const (
-	clientAuthInfo = "client auth info"
+	clientAuthInfo = "client-auth-info-12345"
 	codeAuthFail   = 403
 	textAuthFail   = "auth fail"
 	detailAuthFail = "auth fail detail"