Update dependencies (#52)

* Update module to go 1.21, go-jose to v3

* Always need a valid code now, so default to internal service error

* Remove old proto storage, massage generation, promote proto to v1

Remove the old protobuf based storage, it's not been used for a while so it can
go to clean stuff up. Now only the versioned JSON is supported.

Update the proto build to use tools.go/shimmed local script, to make sure we
generate code with the expected version. This updates us to the latest
old-style proto package.

Promote the persisted types to v1. We don't use Any anywhere, so the package
name isn't a problem.

* Update to new protobuf package

* Update all modules, use built-in homedir func

* Correct lint/deprecation issues

* Switch to revive

* use built-in cache dir for default

rather than cluttering up HOME

* Update CI to always use latest stable go

* Use lint action

Author: lstoll-sfdc

.github/workflows/go.yml

@@ -7,14 +7,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-    - name: Set up Go 1.13
-      uses: actions/setup-go@v1
+    - name: Set up Go stable
+      uses: actions/setup-go@v4
       with:
-        go-version: 1.13
+        go-version: stable
       id: go
 
     - name: Check out code into the Go module directory
-      uses: actions/checkout@v1
+      uses: actions/checkout@v4
 
     - name: Get dependencies
       run: go mod download
@@ -26,4 +26,6 @@ jobs:
       run: make test
 
     - name: Lint
-      run: make lint
+      uses: golangci/golangci-lint-action@v3
+      with:
+        version: latest

.golangci.yml

@@ -9,11 +9,13 @@ issues:
   exclude:
     - "exported \\w+ (\\S*['.]*)([a-zA-Z'.*]*) should have comment( \\(or a comment on this block\\))? or be unexported"
     - "Error return value of .((os\\.)?std(out|err)\\..*|.*Close|.*Flush|os\\.Remove(All)?|.*printf?|os\\.(Un)?Setenv). is not checked"
+    - "package-comments: should have a package comment"
+    - "unused-parameter: parameter '\\w+' seems to be unused, consider removing or renaming it as _"
 
 linters:
   enable:
     - errcheck
-    - golint
+    - revive
     - goimports
     - govet
     - misspell

Makefile

@@ -1,6 +1,6 @@
 .PHONY: all build test lint proto
 
-gopath=$(shell go env GOPATH)
+export PATH := $(shell pwd)/bin:$(PATH)
 
 all: proto build test lint
 
@@ -10,13 +10,7 @@ build:
 test:
 	go test -v ./...
 
-lint: bin/golangci-lint-1.23.8
-	./bin/golangci-lint-1.23.8 run ./...
+proto: proto/core/v1/storage.pb.go
 
-bin/golangci-lint-1.23.8:
-	./hack/fetch-golangci-lint.sh
-
-proto: proto/core/v1beta1/storage.pb.go
-
-proto/core/v1beta1/storage.pb.go: proto/core/v1beta1/storage.proto
-	protoc -I proto/core/v1beta1 --go_out=proto/core/v1beta1 storage.proto
+proto/core/v1/storage.pb.go: proto/core/v1/storage.proto
+	protoc -I proto/core/v1 --go_out=proto/core/v1 storage.proto

bin/protoc-gen-go

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+exec go run google.golang.org/protobuf/cmd/protoc-gen-go "$@"

client.go

@@ -8,9 +8,9 @@ import (
 	"strings"
 	"time"
 
+	"github.com/go-jose/go-jose/v3"
 	"github.com/pardot/oidc/discovery"
 	"golang.org/x/oauth2"
-	"gopkg.in/square/go-jose.v2"
 )
 
 const (

clitoken/local_token_source.go

@@ -63,24 +63,25 @@ var _ oidc.TokenSource = (*LocalOIDCTokenSource)(nil)
 // cached.
 //
 // Example:
-//     ctx := context.TODO()
 //
-//     client, err := oidc.DiscoverClient(ctx, StagingURL, ClientID, ClientSecret, "")
-//     if err != nil {
-//       // handle err
-//     }
+//	ctx := context.TODO()
 //
-//     ts, err := NewLocalOIDCTokenSource(client, clientID, clientSecret)
-//     if err != nil {
-//       // handle err
-//     }
+//	client, err := oidc.DiscoverClient(ctx, StagingURL, ClientID, ClientSecret, "")
+//	if err != nil {
+//	  // handle err
+//	}
 //
-//     token, err := ts.Token(ctx)
-//     if err != nil {
-//       // handle error
-//     }
+//	ts, err := NewLocalOIDCTokenSource(client, clientID, clientSecret)
+//	if err != nil {
+//	  // handle err
+//	}
 //
-//     // use token
+//	token, err := ts.Token(ctx)
+//	if err != nil {
+//	  // handle error
+//	}
+//
+//	// use token
 func NewSource(client *oidc.Client, opts ...LocalOIDCTokenSourceOpt) (*LocalOIDCTokenSource, error) {
 	s := &LocalOIDCTokenSource{
 		client:   client,

cmd/oidc-example-op/signer.go

@@ -4,8 +4,8 @@ import (
 	"crypto/rand"
 	"crypto/rsa"
 
+	"github.com/go-jose/go-jose/v3"
 	"github.com/pardot/oidc/signer"
-	"gopkg.in/square/go-jose.v2"
 )
 
 func mustInitSigner() *signer.StaticSigner {

core/oauth2_errors.go

@@ -44,7 +44,11 @@ func writeError(w http.ResponseWriter, req *http.Request, err error) error {
 		if err.WWWAuthenticate != "" {
 			w.Header().Add("WWW-Authenticate", err.WWWAuthenticate)
 		}
-		http.Error(w, m, err.Code)
+		code := err.Code
+		if code == 0 {
+			code = http.StatusInternalServerError
+		}
+		http.Error(w, m, code)
 
 	case *oauth2.TokenError:
 		w.Header().Add("Content-Type", "application/json;charset=UTF-8")

core/oidc.go

@@ -11,9 +11,9 @@ import (
 	"strings"
 	"time"
 
+	"github.com/go-jose/go-jose/v3"
 	"github.com/pardot/oidc"
 	"github.com/pardot/oidc/oauth2"
-	"gopkg.in/square/go-jose.v2"
 )
 
 // Signer is used for signing identity tokens

core/oidc_test.go

@@ -15,7 +15,7 @@ import (
 	"github.com/google/go-cmp/cmp/cmpopts"
 	"github.com/pardot/oidc"
 	"github.com/pardot/oidc/oauth2"
-	corev1beta1 "github.com/pardot/oidc/proto/core/v1beta1"
+	corev1 "github.com/pardot/oidc/proto/core/v1"
 )
 
 func TestStartAuthorization(t *testing.T) {
@@ -79,8 +79,7 @@ func TestStartAuthorization(t *testing.T) {
 				}
 				if sess == nil {
 					t.Error("session should not be nil")
-				}
-				if sess.Request == nil {
+				} else if sess.Request == nil {
 					t.Error("request in session should not be nil")
 				}
 			},
@@ -1013,7 +1012,7 @@ func TestUserinfo(t *testing.T) {
 	}
 }
 
-func mustMarshal(u *corev1beta1.UserToken) string {
+func mustMarshal(u *corev1.UserToken) string {
 	t, err := marshalToken(u)
 	if err != nil {
 		panic(err)