From e3e8df26f2476a4274e4f3df00566a56eeb56801 Mon Sep 17 00:00:00 2001 From: James Elliott Date: Sat, 13 Mar 2021 16:06:19 +1100 Subject: [PATCH] refactor(session): use github.com/fasthttp/session/v2 instead of github.com/authelia/session/v2 (#1809) Reverts to the upstream library instead of our maintenance fork. --- go.mod | 2 +- go.sum | 12 ++++-------- internal/session/encrypting_serializer.go | 2 +- internal/session/encrypting_serializer_test.go | 2 +- internal/session/mocks/mock_storer.go | 10 +++++----- internal/session/provider.go | 6 +++--- internal/session/provider_config.go | 4 ++-- internal/session/provider_config_test.go | 2 +- internal/session/types.go | 4 ++-- 9 files changed, 20 insertions(+), 24 deletions(-) diff --git a/go.mod b/go.mod index 7fcc085dba010..3eea6b748602f 100644 --- a/go.mod +++ b/go.mod @@ -7,12 +7,12 @@ require ( github.com/Gurpartap/logrus-stack v0.0.0-20170710170904-89c00d8a28f4 github.com/Workiva/go-datastructures v1.0.52 github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef - github.com/authelia/session/v2 v2.5.7 github.com/deckarep/golang-set v1.7.1 github.com/dgrijalva/jwt-go v3.2.0+incompatible github.com/duosecurity/duo_api_golang v0.0.0-20201112143038-0e07e9f869e3 github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 // indirect github.com/fasthttp/router v1.3.9 + github.com/fasthttp/session/v2 v2.3.0 github.com/go-ldap/ldap/v3 v3.2.4 github.com/go-sql-driver/mysql v1.5.0 github.com/golang/mock v1.5.0 diff --git a/go.sum b/go.sum index 37d087552982b..35e4a5371557b 100644 --- a/go.sum +++ b/go.sum @@ -29,7 +29,6 @@ github.com/Workiva/go-datastructures v1.0.52 h1:PLSK6pwn8mYdaoaCZEMsXBpBotr4HHn9 github.com/Workiva/go-datastructures v1.0.52/go.mod h1:Z+F2Rca0qCsVYDS8z7bAGm8f3UkzuWYS/oBZz5a7VVA= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= -github.com/andybalholm/brotli v1.0.0/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y= github.com/andybalholm/brotli v1.0.1 h1:KqhlKozYbRtJvsPrrEeXcO+N2l6NYT5A2QAFmSULpEc= github.com/andybalholm/brotli v1.0.1/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= @@ -39,8 +38,6 @@ github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPd github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef h1:46PFijGLmAjMPwCCCo7Jf0W6f9slllCkkv7vyc1yOSg= github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= -github.com/authelia/session/v2 v2.5.7 h1:cdF7cod8Lgw7KavtyQstP511Sov10FafIuGnx+w3a/M= -github.com/authelia/session/v2 v2.5.7/go.mod h1:0bZpmr+V7hL2DVPyutiC+1lcNjdYVVmx3vbZUdigD6c= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= @@ -81,6 +78,8 @@ github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 h1:JWuenKqqX8nojt github.com/facebookgo/stack v0.0.0-20160209184415-751773369052/go.mod h1:UbMTZqLaRiH3MsBH8va0n7s1pQYcu3uTb8G4tygF4Zg= github.com/fasthttp/router v1.3.9 h1:/V71/6mBpH8oohAaR/DtBB4el6EETbNsBPBoCJZc4gc= github.com/fasthttp/router v1.3.9/go.mod h1:hKaPPZT9HWA/bEs1pSIbofAxZCLz3oPNTHtn/xqw6j0= +github.com/fasthttp/session/v2 v2.3.0 h1:ej+hYbgybXZPoJYOqNsoaG6/bA0JGiFAwV72bzZ77RI= +github.com/fasthttp/session/v2 v2.3.0/go.mod h1:bnbhn/R1imDC1MCK6lvjPQoxZdsuGH3j6QkSx1xj1t8= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= @@ -226,7 +225,6 @@ github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfV github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.10.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.11.8 h1:difgzQsp5mdAz9v8lm3P/I+EpDKMU/6uTMw1y1FObuo= github.com/klauspost/compress v1.11.8/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= @@ -242,8 +240,8 @@ github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/lib/pq v1.9.0 h1:L8nSXQQzAYByakOFMTwpjRoHsMJklur4Gi59b6VivR8= -github.com/lib/pq v1.9.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= +github.com/lib/pq v1.10.0 h1:Zx5DJFEYQXio93kgXnQ09fXNiUKsqv4OUEu2UtGcB1E= +github.com/lib/pq v1.10.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4= github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= @@ -381,7 +379,6 @@ github.com/tstranex/u2f v1.0.0/go.mod h1:eahSLaqAS0zsIEv80+vXT7WanXs7MQQDg3j3wGB github.com/ttacon/chalk v0.0.0-20160626202418-22c06c80ed31/go.mod h1:onvgF043R+lC5RZ8IT9rBXDaEDnpnw/Cl+HFiw+v/7Q= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= -github.com/valyala/fasthttp v1.21.0/go.mod h1:jjraHZVbKOXftJfsOYoAjaeygpj5hr8ermTRJNroD7A= github.com/valyala/fasthttp v1.22.0 h1:OpwH5KDOJ9cS2bq8fD+KfT4IrksK0llvkHf4MZx42jQ= github.com/valyala/fasthttp v1.22.0/go.mod h1:0mw2RjXGOzxf4NL2jni3gUQ7LfjjUSiG5sskOUUSEpU= github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio= @@ -453,7 +450,6 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20201006153459-a7d1128ccaa0/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201016165138-7b1cca2348c0/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210226101413-39120d07d75e h1:jIQURUJ9mlLvYwTBtRHm9h58rYhSonLvRvgAnP8Nr7I= golang.org/x/net v0.0.0-20210226101413-39120d07d75e/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= diff --git a/internal/session/encrypting_serializer.go b/internal/session/encrypting_serializer.go index 8b1d433cf5aa7..a6a9d0d3b4166 100644 --- a/internal/session/encrypting_serializer.go +++ b/internal/session/encrypting_serializer.go @@ -4,7 +4,7 @@ import ( "crypto/sha256" "fmt" - "github.com/authelia/session/v2" + "github.com/fasthttp/session/v2" "github.com/authelia/authelia/internal/utils" ) diff --git a/internal/session/encrypting_serializer_test.go b/internal/session/encrypting_serializer_test.go index e84ceecd7d1bd..589033ecb7a02 100644 --- a/internal/session/encrypting_serializer_test.go +++ b/internal/session/encrypting_serializer_test.go @@ -3,7 +3,7 @@ package session import ( "testing" - "github.com/authelia/session/v2" + "github.com/fasthttp/session/v2" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/internal/session/mocks/mock_storer.go b/internal/session/mocks/mock_storer.go index bc9ff640b78cf..b710447dee69d 100644 --- a/internal/session/mocks/mock_storer.go +++ b/internal/session/mocks/mock_storer.go @@ -1,15 +1,15 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/authelia/session/v2 (interfaces: Storer) +// Source: github.com/fasthttp/session/v2 (interfaces: Storer) // Package mock_session is a generated GoMock package. package mock_session import ( - reflect "reflect" - time "time" + "reflect" + "time" - session "github.com/authelia/session/v2" - gomock "github.com/golang/mock/gomock" + "github.com/fasthttp/session/v2" + "github.com/golang/mock/gomock" ) // MockStorer is a mock of Storer interface diff --git a/internal/session/provider.go b/internal/session/provider.go index ca7196d97bbef..a8544ae5dfae0 100644 --- a/internal/session/provider.go +++ b/internal/session/provider.go @@ -5,9 +5,9 @@ import ( "encoding/json" "time" - fasthttpsession "github.com/authelia/session/v2" - "github.com/authelia/session/v2/providers/memory" - "github.com/authelia/session/v2/providers/redis" + fasthttpsession "github.com/fasthttp/session/v2" + "github.com/fasthttp/session/v2/providers/memory" + "github.com/fasthttp/session/v2/providers/redis" "github.com/valyala/fasthttp" "github.com/authelia/authelia/internal/configuration/schema" diff --git a/internal/session/provider_config.go b/internal/session/provider_config.go index f151ece0829d8..d909a09b3049e 100644 --- a/internal/session/provider_config.go +++ b/internal/session/provider_config.go @@ -6,8 +6,8 @@ import ( "fmt" "strings" - "github.com/authelia/session/v2" - "github.com/authelia/session/v2/providers/redis" + "github.com/fasthttp/session/v2" + "github.com/fasthttp/session/v2/providers/redis" "github.com/valyala/fasthttp" "github.com/authelia/authelia/internal/configuration/schema" diff --git a/internal/session/provider_config_test.go b/internal/session/provider_config_test.go index fdb9b99d875a4..13edc99ae9230 100644 --- a/internal/session/provider_config_test.go +++ b/internal/session/provider_config_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/authelia/session/v2" + "github.com/fasthttp/session/v2" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/internal/session/types.go b/internal/session/types.go index c891cea2d4dbd..de2649f37ac6d 100644 --- a/internal/session/types.go +++ b/internal/session/types.go @@ -3,8 +3,8 @@ package session import ( "time" - "github.com/authelia/session/v2" - "github.com/authelia/session/v2/providers/redis" + "github.com/fasthttp/session/v2" + "github.com/fasthttp/session/v2/providers/redis" "github.com/tstranex/u2f" "github.com/authelia/authelia/internal/authentication"