Signed-off-by: Corey Daley <cdaley@redhat.com>

updating to go1.19, adding github actions

.github/workflows/issues.yml

@@ -0,0 +1,17 @@
+# Add all the issues created to the project.
+name: Add all issues to Project
+
+on:
+  issues:
+    types:
+      - opened
+
+jobs:
+  add-to-project:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Add issue to project
+        uses: actions/add-to-project@v0.5.0
+        with:
+          project-url: https://github.com/orgs/gorilla/projects/4
+          github-token: ${{ secrets.ADD_TO_PROJECT_TOKEN }}

.github/workflows/test.yml

@@ -0,0 +1,40 @@
+name: CI
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+permissions:
+  contents: read
+
+jobs:
+  verify-and-test:
+    strategy:
+      matrix:
+        go: ['1.18', '1.19','1.20']
+        os: [ubuntu-latest, macos-latest, windows-latest]
+      fail-fast: true
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v3
+
+      - name: Setup Go ${{ matrix.go }}
+        uses: actions/setup-go@v4
+        with:
+          go-version: ${{ matrix.go }}
+          cache: false
+
+      - name: Verify
+        uses: golangci/golangci-lint-action@v3
+        with:
+          version: v1.53
+          args: --timeout=5m
+
+      - name: Test
+        run: go test -race -coverprofile=coverage.txt -covermode=atomic
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v3

Makefile

@@ -0,0 +1,33 @@
+SHELL := /bin/bash
+
+# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
+ifeq (,$(shell go env GOBIN))
+GOBIN=$(shell go env GOPATH)/bin
+else
+GOBIN=$(shell go env GOBIN)
+endif
+
+# LINT is the path to the golangci-lint binary
+LINT = $(shell which golangci-lint)
+
+.PHONY: golangci-lint
+golangci-lint:
+ifeq (, $(LINT))
+  ifeq (, $(shell which golangci-lint))
+	@{ \
+	set -e ;\
+	go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest ;\
+	}
+  override LINT=$(GOBIN)/golangci-lint
+  else
+  override LINT=$(shell which golangci-lint)
+  endif
+endif
+
+.PHONY: verify
+verify: golangci-lint
+	$(LINT) run
+
+.PHONY: test
+test:
+	go test -race --coverprofile=coverage.coverprofile --covermode=atomic -v ./...

coverage.coverprofile

@@ -0,0 +1,102 @@
+mode: atomic
+github.com/gorilla/sessions/cookie_go111.go:9.78,21.2 1 18
+github.com/gorilla/sessions/lex.go:88.27,91.2 2 74
+github.com/gorilla/sessions/lex.go:93.30,95.2 1 74
+github.com/gorilla/sessions/lex.go:97.41,98.15 1 7
+github.com/gorilla/sessions/lex.go:98.15,100.3 1 0
+github.com/gorilla/sessions/lex.go:101.2,101.47 1 7
+github.com/gorilla/sessions/sessions.go:21.52,28.2 1 11
+github.com/gorilla/sessions/sessions.go:47.57,50.19 3 7
+github.com/gorilla/sessions/sessions.go:50.19,52.3 1 2
+github.com/gorilla/sessions/sessions.go:53.2,53.32 1 7
+github.com/gorilla/sessions/sessions.go:53.32,57.3 2 3
+github.com/gorilla/sessions/sessions.go:58.2,58.16 1 7
+github.com/gorilla/sessions/sessions.go:65.63,67.19 2 4
+github.com/gorilla/sessions/sessions.go:67.19,69.3 1 1
+github.com/gorilla/sessions/sessions.go:70.2,71.32 2 4
+github.com/gorilla/sessions/sessions.go:71.32,73.3 1 1
+github.com/gorilla/sessions/sessions.go:74.2,74.40 1 4
+github.com/gorilla/sessions/sessions.go:80.70,82.2 1 7
+github.com/gorilla/sessions/sessions.go:85.33,87.2 1 18
+github.com/gorilla/sessions/sessions.go:90.33,92.2 1 0
+github.com/gorilla/sessions/sessions.go:109.45,112.21 3 9
+github.com/gorilla/sessions/sessions.go:112.21,114.3 1 4
+github.com/gorilla/sessions/sessions.go:115.2,120.20 3 5
+github.com/gorilla/sessions/sessions.go:132.80,133.30 1 7
+github.com/gorilla/sessions/sessions.go:133.30,135.3 1 1
+github.com/gorilla/sessions/sessions.go:136.2,136.38 1 6
+github.com/gorilla/sessions/sessions.go:136.38,138.3 1 1
+github.com/gorilla/sessions/sessions.go:138.8,142.3 3 5
+github.com/gorilla/sessions/sessions.go:143.2,144.8 2 6
+github.com/gorilla/sessions/sessions.go:148.54,150.37 2 2
+github.com/gorilla/sessions/sessions.go:150.37,152.27 2 2
+github.com/gorilla/sessions/sessions.go:152.27,155.4 1 0
+github.com/gorilla/sessions/sessions.go:155.9,155.74 1 2
+github.com/gorilla/sessions/sessions.go:155.74,158.4 1 0
+github.com/gorilla/sessions/sessions.go:160.2,160.21 1 2
+github.com/gorilla/sessions/sessions.go:160.21,162.3 1 0
+github.com/gorilla/sessions/sessions.go:163.2,163.12 1 2
+github.com/gorilla/sessions/sessions.go:168.13,170.2 1 1
+github.com/gorilla/sessions/sessions.go:173.57,175.2 1 2
+github.com/gorilla/sessions/sessions.go:180.67,182.24 2 8
+github.com/gorilla/sessions/sessions.go:182.24,185.3 2 5
+github.com/gorilla/sessions/sessions.go:185.8,185.31 1 3
+github.com/gorilla/sessions/sessions.go:185.31,188.3 1 1
+github.com/gorilla/sessions/sessions.go:189.2,189.15 1 8
+github.com/gorilla/sessions/sessions.go:199.36,201.22 2 0
+github.com/gorilla/sessions/sessions.go:201.22,202.15 1 0
+github.com/gorilla/sessions/sessions.go:202.15,203.14 1 0
+github.com/gorilla/sessions/sessions.go:203.14,205.5 1 0
+github.com/gorilla/sessions/sessions.go:206.4,206.7 1 0
+github.com/gorilla/sessions/sessions.go:209.2,209.11 1 0
+github.com/gorilla/sessions/sessions.go:210.9,211.22 1 0
+github.com/gorilla/sessions/sessions.go:212.9,213.11 1 0
+github.com/gorilla/sessions/sessions.go:214.9,215.36 1 0
+github.com/gorilla/sessions/sessions.go:217.2,217.56 1 0
+github.com/gorilla/sessions/store.go:48.54,59.2 3 3
+github.com/gorilla/sessions/store.go:74.75,76.2 1 7
+github.com/gorilla/sessions/store.go:83.75,89.54 6 6
+github.com/gorilla/sessions/store.go:89.54,92.17 2 2
+github.com/gorilla/sessions/store.go:92.17,94.4 1 2
+github.com/gorilla/sessions/store.go:96.2,96.21 1 6
+github.com/gorilla/sessions/store.go:101.26,104.16 2 3
+github.com/gorilla/sessions/store.go:104.16,106.3 1 0
+github.com/gorilla/sessions/store.go:107.2,108.12 2 3
+github.com/gorilla/sessions/store.go:114.39,118.33 2 3
+github.com/gorilla/sessions/store.go:118.33,119.55 1 2
+github.com/gorilla/sessions/store.go:119.55,121.4 1 2
+github.com/gorilla/sessions/store.go:135.75,136.16 1 4
+github.com/gorilla/sessions/store.go:136.16,138.3 1 4
+github.com/gorilla/sessions/store.go:139.2,149.11 3 4
+github.com/gorilla/sessions/store.go:166.44,167.29 1 1
+github.com/gorilla/sessions/store.go:167.29,168.54 1 1
+github.com/gorilla/sessions/store.go:168.54,170.4 1 1
+github.com/gorilla/sessions/store.go:177.79,179.2 1 0
+github.com/gorilla/sessions/store.go:184.79,190.54 6 4
+github.com/gorilla/sessions/store.go:190.54,192.17 2 0
+github.com/gorilla/sessions/store.go:192.17,194.18 2 0
+github.com/gorilla/sessions/store.go:194.18,196.5 1 0
+github.com/gorilla/sessions/store.go:199.2,199.21 1 4
+github.com/gorilla/sessions/store.go:211.26,213.33 1 6
+github.com/gorilla/sessions/store.go:213.33,214.42 1 2
+github.com/gorilla/sessions/store.go:214.42,216.4 1 0
+github.com/gorilla/sessions/store.go:217.3,218.13 2 2
+github.com/gorilla/sessions/store.go:221.2,221.22 1 4
+github.com/gorilla/sessions/store.go:221.22,226.3 1 3
+github.com/gorilla/sessions/store.go:227.2,227.40 1 4
+github.com/gorilla/sessions/store.go:227.40,229.3 1 1
+github.com/gorilla/sessions/store.go:230.2,232.16 2 3
+github.com/gorilla/sessions/store.go:232.16,234.3 1 0
+github.com/gorilla/sessions/store.go:235.2,236.12 2 3
+github.com/gorilla/sessions/store.go:242.43,246.33 2 4
+github.com/gorilla/sessions/store.go:246.33,247.55 1 3
+github.com/gorilla/sessions/store.go:247.55,249.4 1 3
+github.com/gorilla/sessions/store.go:254.56,257.16 2 4
+github.com/gorilla/sessions/store.go:257.16,259.3 1 1
+github.com/gorilla/sessions/store.go:260.2,263.54 4 3
+github.com/gorilla/sessions/store.go:267.56,272.16 5 0
+github.com/gorilla/sessions/store.go:272.16,274.3 1 0
+github.com/gorilla/sessions/store.go:275.2,276.45 1 0
+github.com/gorilla/sessions/store.go:276.45,278.3 1 0
+github.com/gorilla/sessions/store.go:279.2,279.12 1 0
+github.com/gorilla/sessions/store.go:283.57,291.2 5 2

go.mod

@@ -1,3 +1,5 @@
 module github.com/gorilla/sessions
 
+go 1.19
+
 require github.com/gorilla/securecookie v1.1.1

sessions_test.go

@@ -75,7 +75,6 @@ func TestFlashes(t *testing.T) {
 
 	req, _ = http.NewRequest("GET", "http://localhost:8080/", nil)
 	req.Header.Add("Cookie", cookies[0])
-	rsp = NewRecorder()
 	// Get a session.
 	if session, err = store.Get(req, "session-key"); err != nil {
 		t.Fatalf("Error getting session: %v", err)
@@ -135,7 +134,6 @@ func TestFlashes(t *testing.T) {
 
 	req, _ = http.NewRequest("GET", "http://localhost:8080/", nil)
 	req.Header.Add("Cookie", cookies[0])
-	rsp = NewRecorder()
 	// Get a session.
 	if session, err = store.Get(req, "session-key"); err != nil {
 		t.Fatalf("Error getting session: %v", err)

store.go

@@ -6,7 +6,6 @@ package sessions
 
 import (
 	"encoding/base32"
-	"io/ioutil"
 	"net/http"
 	"os"
 	"path/filepath"
@@ -261,15 +260,15 @@ func (s *FilesystemStore) save(session *Session) error {
 	filename := filepath.Join(s.path, "session_"+session.ID)
 	fileMutex.Lock()
 	defer fileMutex.Unlock()
-	return ioutil.WriteFile(filename, []byte(encoded), 0600)
+	return os.WriteFile(filename, []byte(encoded), 0600)
 }
 
 // load reads a file and decodes its content into session.Values.
 func (s *FilesystemStore) load(session *Session) error {
 	filename := filepath.Join(s.path, "session_"+session.ID)
 	fileMutex.RLock()
 	defer fileMutex.RUnlock()
-	fdata, err := ioutil.ReadFile(filename)
+	fdata, err := os.ReadFile(filename)
 	if err != nil {
 		return err
 	}