Make GSS implement both lib/pq and jackc/pgconn (#4)

There was a sneaky little issue because the two libraries use different spellings for one of the functions.
otan · May 25, 2022 · 2749fc9 · 2749fc9
1 parent a00c903
commit 2749fc9
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/krb_unix.go b/krb_unix.go
@@ -22,7 +22,7 @@ import (
  * Keytab support is available only on unix systems
  */
 
-// GSS implements the pq.GSS interface.
+// GSS implements the pq.GSS interface and the pgconn.GSS interface.
 type GSS struct {
 	cli    *client.Client
 	ktPath string
@@ -127,7 +127,7 @@ func (g *GSS) GetInitToken(host string, service string) ([]byte, error) {
 	return g.GetInitTokenFromSPN(spn)
 }
 
-// GetInitTokenFromSpn implements the GSS interface.
+// GetInitTokenFromSPN implements the GSS interface.
 func (g *GSS) GetInitTokenFromSPN(spn string) ([]byte, error) {
 	s := spnego.SPNEGOClient(g.cli, spn)
 
@@ -144,6 +144,11 @@ func (g *GSS) GetInitTokenFromSPN(spn string) ([]byte, error) {
 	return b, nil
 }
 
+// GetInitTokenFromSpn implements the GSS interface.
+func (g *GSS) GetInitTokenFromSpn(spn string) ([]byte, error) {
+	return g.GetInitTokenFromSPN(spn)
+}
+
 // Continue implements the GSS interface.
 func (g *GSS) Continue(inToken []byte) (done bool, outToken []byte, err error) {
 	t := &spnego.SPNEGOToken{}

diff --git a/krb_windows.go b/krb_windows.go
@@ -8,7 +8,7 @@ import (
 	"github.com/alexbrainman/sspi/negotiate"
 )
 
-// GSS implements the pq.GSS interface.
+// GSS implements the pq.GSS interface and the pgconn.GSS interface.
 type GSS struct {
 	creds *sspi.Credentials
 	ctx   *negotiate.ClientContext
@@ -49,8 +49,8 @@ func (g *GSS) GetInitToken(host string, service string) ([]byte, error) {
 	return g.GetInitTokenFromSpn(spn)
 }
 
-// GetInitTokenFromSpn implements the GSS interface.
-func (g *GSS) GetInitTokenFromSpn(spn string) ([]byte, error) {
+// GetInitTokenFromSPN implements the GSS interface.
+func (g *GSS) GetInitTokenFromSPN(spn string) ([]byte, error) {
 	ctx, token, err := negotiate.NewClientContext(g.creds, spn)
 	if err != nil {
 		return nil, err
@@ -61,6 +61,11 @@ func (g *GSS) GetInitTokenFromSpn(spn string) ([]byte, error) {
 	return token, nil
 }
 
+// GetInitTokenFromSpn implements the GSS interface.
+func (g *GSS) GetInitTokenFromSpn(spn string) ([]byte, error) {
+	return g.GetInitTokenFromSPN(spn)
+}
+
 // Continue implements the GSS interface.
 func (g *GSS) Continue(inToken []byte) (done bool, outToken []byte, err error) {
 	return g.ctx.Update(inToken)