Explorar o código

Just some basic code cleanup

Levi Gross %!s(int64=8) %!d(string=hai) anos
pai
achega
f517434b45

+ 1 - 1
client/ASExchange.go

@@ -55,7 +55,7 @@ func (cl *Client) ASExchange(realm string, referral int) error {
 				if referral > 5 {
 					return krberror.Errorf(err, krberror.KRBMsgError, "maximum number of client referrals exceeded")
 				}
-				referral += 1
+				referral++
 				return cl.ASExchange(e.CRealm, referral)
 			}
 		} else {

+ 1 - 1
client/TGSExchange.go

@@ -50,7 +50,7 @@ func (cl *Client) TGSExchange(spn types.PrincipalName, kdcRealm string, tkt mess
 		}
 		cl.AddSession(tgsRep.Ticket, tgsRep.DecryptedEncPart)
 		realm := tgsRep.Ticket.SName.NameString[1]
-		referral += 1
+		referral++
 		return cl.TGSExchange(spn, realm, tgsRep.Ticket, tgsRep.DecryptedEncPart.Key, false, referral)
 	}
 	if ok, err := tgsRep.IsValid(cl.Config, tgsReq); !ok {

+ 1 - 1
client/client.go

@@ -151,7 +151,7 @@ func (cl *Client) Key(etype etype.EType, krberr messages.KRBError) (types.Encryp
 		key, _, err := crypto.GetKeyFromPassword(cl.Credentials.Password, cl.Credentials.CName, cl.Credentials.Realm, etype.GetETypeID(), types.PADataSequence{})
 		return key, err
 	}
-	return types.EncryptionKey{}, errors.New("credential has neither keytab or password to generate key.")
+	return types.EncryptionKey{}, errors.New("credential has neither keytab or password to generate key")
 }
 
 // LoadConfig loads the Kerberos configuration for the client from file path specified.

+ 3 - 3
client/network.go

@@ -65,7 +65,7 @@ func (cl *Client) resolveKDC(realm string, tcp bool) (int, map[int]string, error
 				} else {
 					l = 0
 				}
-				i += 1
+				i++
 			}
 		} else {
 			kdcs[i] = ks[0]
@@ -142,7 +142,7 @@ func dialKDCUDP(count int, kdcs map[int]string) (conn *net.UDPConn, err error) {
 			conn.SetDeadline(time.Now().Add(time.Duration(5 * time.Second)))
 			return
 		}
-		i += 1
+		i++
 	}
 	err = errors.New("error in getting a UDP connection to any of the KDCs")
 	return
@@ -161,7 +161,7 @@ func dialKDCTCP(count int, kdcs map[int]string) (conn *net.TCPConn, err error) {
 			conn.SetDeadline(time.Now().Add(time.Duration(5 * time.Second)))
 			return
 		}
-		i += 1
+		i++
 	}
 	err = errors.New("error in getting a TCP connection to any of the KDCs")
 	return

+ 1 - 1
gssapi/WrapToken.go

@@ -171,7 +171,7 @@ func (wt *WrapToken) VerifyCheckSum(key types.EncryptionKey, keyUsage uint32) (b
 func (wt *WrapToken) Unmarshal(b []byte, expectFromAcceptor bool) error {
 	// Check if we can read a whole header
 	if len(b) < 16 {
-		return errors.New("bytes shorter than header length.")
+		return errors.New("bytes shorter than header length")
 	}
 	// Is the Token ID correct?
 	if !bytes.Equal(getGssWrapTokenId()[:], b[0:2]) {

+ 2 - 1
service/authenticator_test.go

@@ -1,9 +1,10 @@
 package service
 
 import (
+	"testing"
+
 	"github.com/stretchr/testify/assert"
 	"gopkg.in/jcmturner/goidentity.v1"
-	"testing"
 )
 
 func TestImplementsInterface(t *testing.T) {