diff options
Diffstat (limited to 'internal')
151 files changed, 306 insertions, 306 deletions
diff --git a/internal/authentication/file_user_provider.go b/internal/authentication/file_user_provider.go index 7a11c2c42..74cf4ff86 100644 --- a/internal/authentication/file_user_provider.go +++ b/internal/authentication/file_user_provider.go @@ -11,8 +11,8 @@ import ( "github.com/asaskevich/govalidator" "gopkg.in/yaml.v2" - "github.com/authelia/authelia/internal/configuration/schema" - "github.com/authelia/authelia/internal/logging" + "github.com/authelia/authelia/v4/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/logging" ) // FileUserProvider is a provider reading details from a file. diff --git a/internal/authentication/file_user_provider_test.go b/internal/authentication/file_user_provider_test.go index ffdb0e86a..df12e0149 100644 --- a/internal/authentication/file_user_provider_test.go +++ b/internal/authentication/file_user_provider_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/authelia/authelia/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/configuration/schema" ) func WithDatabase(content []byte, f func(path string)) { diff --git a/internal/authentication/ldap_user_provider.go b/internal/authentication/ldap_user_provider.go index 5dfd6cbcb..00e8b8ff1 100644 --- a/internal/authentication/ldap_user_provider.go +++ b/internal/authentication/ldap_user_provider.go @@ -11,9 +11,9 @@ import ( "github.com/sirupsen/logrus" "golang.org/x/text/encoding/unicode" - "github.com/authelia/authelia/internal/configuration/schema" - "github.com/authelia/authelia/internal/logging" - "github.com/authelia/authelia/internal/utils" + "github.com/authelia/authelia/v4/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/logging" + "github.com/authelia/authelia/v4/internal/utils" ) // LDAPUserProvider is a UserProvider that connects to LDAP servers like ActiveDirectory, OpenLDAP, OpenDJ, FreeIPA, etc. diff --git a/internal/authentication/ldap_user_provider_test.go b/internal/authentication/ldap_user_provider_test.go index 93d2829d0..701c8564b 100644 --- a/internal/authentication/ldap_user_provider_test.go +++ b/internal/authentication/ldap_user_provider_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/text/encoding/unicode" - "github.com/authelia/authelia/internal/configuration/schema" - "github.com/authelia/authelia/internal/utils" + "github.com/authelia/authelia/v4/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/utils" ) func TestShouldCreateRawConnectionWhenSchemeIsLDAP(t *testing.T) { diff --git a/internal/authentication/password_hash.go b/internal/authentication/password_hash.go index 604b4a01f..70f30d47d 100644 --- a/internal/authentication/password_hash.go +++ b/internal/authentication/password_hash.go @@ -9,7 +9,7 @@ import ( "github.com/simia-tech/crypt" - "github.com/authelia/authelia/internal/utils" + "github.com/authelia/authelia/v4/internal/utils" ) // PasswordHash represents all characteristics of a password hash. diff --git a/internal/authentication/password_hash_test.go b/internal/authentication/password_hash_test.go index a95f05b23..db23721fd 100644 --- a/internal/authentication/password_hash_test.go +++ b/internal/authentication/password_hash_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/authelia/authelia/internal/configuration/schema" - "github.com/authelia/authelia/internal/utils" + "github.com/authelia/authelia/v4/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/utils" ) func TestShouldHashSHA512Password(t *testing.T) { diff --git a/internal/authorization/access_control_domain.go b/internal/authorization/access_control_domain.go index e018621ad..d7c60194f 100644 --- a/internal/authorization/access_control_domain.go +++ b/internal/authorization/access_control_domain.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/authelia/authelia/internal/utils" + "github.com/authelia/authelia/v4/internal/utils" ) // AccessControlDomain represents an ACL domain. diff --git a/internal/authorization/access_control_rule.go b/internal/authorization/access_control_rule.go index 01fbbf708..81c8f0326 100644 --- a/internal/authorization/access_control_rule.go +++ b/internal/authorization/access_control_rule.go @@ -3,8 +3,8 @@ package authorization import ( "net" - "github.com/authelia/authelia/internal/configuration/schema" - "github.com/authelia/authelia/internal/utils" + "github.com/authelia/authelia/v4/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/utils" ) // NewAccessControlRules converts a schema.AccessControlConfiguration into an AccessControlRule slice. diff --git a/internal/authorization/access_control_subjects.go b/internal/authorization/access_control_subjects.go index 6e5efc7bc..cb2c3751f 100644 --- a/internal/authorization/access_control_subjects.go +++ b/internal/authorization/access_control_subjects.go @@ -1,7 +1,7 @@ package authorization import ( - "github.com/authelia/authelia/internal/utils" + "github.com/authelia/authelia/v4/internal/utils" ) // AccessControlSubject abstracts an ACL subject of type `group:` or `user:`. diff --git a/internal/authorization/authorizer.go b/internal/authorization/authorizer.go index 2cc79b5cb..4ee601503 100644 --- a/internal/authorization/authorizer.go +++ b/internal/authorization/authorizer.go @@ -1,8 +1,8 @@ package authorization import ( - "github.com/authelia/authelia/internal/configuration/schema" - "github.com/authelia/authelia/internal/logging" + "github.com/authelia/authelia/v4/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/logging" ) // Authorizer the component in charge of checking whether a user can access a given resource. diff --git a/internal/authorization/authorizer_test.go b/internal/authorization/authorizer_test.go index ee9417d6b..c8858e542 100644 --- a/internal/authorization/authorizer_test.go +++ b/internal/authorization/authorizer_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - "github.com/authelia/authelia/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/configuration/schema" ) type AuthorizerSuite struct { diff --git a/internal/authorization/util.go b/internal/authorization/util.go index 7aeb1ad23..64aac911b 100644 --- a/internal/authorization/util.go +++ b/internal/authorization/util.go @@ -5,8 +5,8 @@ import ( "regexp" "strings" - "github.com/authelia/authelia/internal/authentication" - "github.com/authelia/authelia/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/authentication" + "github.com/authelia/authelia/v4/internal/configuration/schema" ) // PolicyToLevel converts a string policy to int authorization level. diff --git a/internal/authorization/util_test.go b/internal/authorization/util_test.go index f06f6adbe..52354eaeb 100644 --- a/internal/authorization/util_test.go +++ b/internal/authorization/util_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/authelia/authelia/internal/authentication" - "github.com/authelia/authelia/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/authentication" + "github.com/authelia/authelia/v4/internal/configuration/schema" ) func TestShouldNotParseInvalidSubjects(t *testing.T) { diff --git a/internal/commands/build-info.go b/internal/commands/build-info.go index d3c23c21c..9e260e573 100644 --- a/internal/commands/build-info.go +++ b/internal/commands/build-info.go @@ -6,7 +6,7 @@ import ( "github.com/spf13/cobra" - "github.com/authelia/authelia/internal/utils" + "github.com/authelia/authelia/v4/internal/utils" ) func newBuildInfoCmd() (cmd *cobra.Command) { diff --git a/internal/commands/configuration.go b/internal/commands/configuration.go index 480d25e9a..3f3a28125 100644 --- a/internal/commands/configuration.go +++ b/internal/commands/configuration.go @@ -5,10 +5,10 @@ import ( "github.com/spf13/cobra" - "github.com/authelia/authelia/internal/configuration" - "github.com/authelia/authelia/internal/configuration/schema" - "github.com/authelia/authelia/internal/configuration/validator" - "github.com/authelia/authelia/internal/logging" + "github.com/authelia/authelia/v4/internal/configuration" + "github.com/authelia/authelia/v4/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/configuration/validator" + "github.com/authelia/authelia/v4/internal/logging" ) // cmdWithConfigFlags is used for commands which require access to the configuration to add the flag to the command. diff --git a/internal/commands/hash.go b/internal/commands/hash.go index 1d35c56e5..db4b98cf8 100644 --- a/internal/commands/hash.go +++ b/internal/commands/hash.go @@ -6,9 +6,9 @@ import ( "github.com/simia-tech/crypt" "github.com/spf13/cobra" - "github.com/authelia/authelia/internal/authentication" - "github.com/authelia/authelia/internal/configuration/schema" - "github.com/authelia/authelia/internal/logging" + "github.com/authelia/authelia/v4/internal/authentication" + "github.com/authelia/authelia/v4/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/logging" ) // NewHashPasswordCmd returns a new Hash Password Cmd. diff --git a/internal/commands/root.go b/internal/commands/root.go index 8565233a5..c2fc0a8e3 100644 --- a/internal/commands/root.go +++ b/internal/commands/root.go @@ -6,18 +6,18 @@ import ( "github.com/spf13/cobra" - "github.com/authelia/authelia/internal/authentication" - "github.com/authelia/authelia/internal/authorization" - "github.com/authelia/authelia/internal/configuration/schema" - "github.com/authelia/authelia/internal/logging" - "github.com/authelia/authelia/internal/middlewares" - "github.com/authelia/authelia/internal/notification" - "github.com/authelia/authelia/internal/oidc" - "github.com/authelia/authelia/internal/regulation" - "github.com/authelia/authelia/internal/server" - "github.com/authelia/authelia/internal/session" - "github.com/authelia/authelia/internal/storage" - "github.com/authelia/authelia/internal/utils" + "github.com/authelia/authelia/v4/internal/authentication" + "github.com/authelia/authelia/v4/internal/authorization" + "github.com/authelia/authelia/v4/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/logging" + "github.com/authelia/authelia/v4/internal/middlewares" + "github.com/authelia/authelia/v4/internal/notification" + "github.com/authelia/authelia/v4/internal/oidc" + "github.com/authelia/authelia/v4/internal/regulation" + "github.com/authelia/authelia/v4/internal/server" + "github.com/authelia/authelia/v4/internal/session" + "github.com/authelia/authelia/v4/internal/storage" + "github.com/authelia/authelia/v4/internal/utils" ) // NewRootCmd returns a new Root Cmd. diff --git a/internal/commands/rsa.go b/internal/commands/rsa.go index 29e995dd3..650406b28 100644 --- a/internal/commands/rsa.go +++ b/internal/commands/rsa.go @@ -7,7 +7,7 @@ import ( "github.com/spf13/cobra" - "github.com/authelia/authelia/internal/utils" + "github.com/authelia/authelia/v4/internal/utils" ) // NewRSACmd returns a new RSA Cmd. diff --git a/internal/commands/validate.go b/internal/commands/validate.go index 54f119a92..4c8a73c3a 100644 --- a/internal/commands/validate.go +++ b/internal/commands/validate.go @@ -6,10 +6,10 @@ import ( "github.com/spf13/cobra" - "github.com/authelia/authelia/internal/configuration" - "github.com/authelia/authelia/internal/configuration/schema" - "github.com/authelia/authelia/internal/configuration/validator" - "github.com/authelia/authelia/internal/logging" + "github.com/authelia/authelia/v4/internal/configuration" + "github.com/authelia/authelia/v4/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/configuration/validator" + "github.com/authelia/authelia/v4/internal/logging" ) func newValidateConfigCmd() (cmd *cobra.Command) { diff --git a/internal/configuration/configuration_test.go b/internal/configuration/configuration_test.go index 263dd46ff..05ea96acf 100644 --- a/internal/configuration/configuration_test.go +++ b/internal/configuration/configuration_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/authelia/authelia/internal/utils" + "github.com/authelia/authelia/v4/internal/utils" ) func TestShouldHaveSameChecksumForBothTemplates(t *testing.T) { diff --git a/internal/configuration/helpers.go b/internal/configuration/helpers.go index 6301e4ddf..43a54e179 100644 --- a/internal/configuration/helpers.go +++ b/internal/configuration/helpers.go @@ -4,7 +4,7 @@ import ( "io/ioutil" "strings" - "github.com/authelia/authelia/internal/utils" + "github.com/authelia/authelia/v4/internal/utils" ) func getEnvConfigMap(keys []string, prefix, delimiter string) (keyMap map[string]string, ignoredKeys []string) { diff --git a/internal/configuration/koanf_callbacks.go b/internal/configuration/koanf_callbacks.go index 87a692541..3823f3911 100644 --- a/internal/configuration/koanf_callbacks.go +++ b/internal/configuration/koanf_callbacks.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" - "github.com/authelia/authelia/internal/configuration/schema" - "github.com/authelia/authelia/internal/configuration/validator" - "github.com/authelia/authelia/internal/utils" + "github.com/authelia/authelia/v4/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/configuration/validator" + "github.com/authelia/authelia/v4/internal/utils" ) // koanfEnvironmentCallback returns a koanf callback to map the environment vars to Configuration keys. diff --git a/internal/configuration/koanf_callbacks_test.go b/internal/configuration/koanf_callbacks_test.go index 51a1f3ce3..ea00edaaf 100644 --- a/internal/configuration/koanf_callbacks_test.go +++ b/internal/configuration/koanf_callbacks_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/authelia/authelia/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/configuration/schema" ) func TestKoanfEnvironmentCallback(t *testing.T) { diff --git a/internal/configuration/provider.go b/internal/configuration/provider.go index 0f6ae8bdc..a8a94cbfb 100644 --- a/internal/configuration/provider.go +++ b/internal/configuration/provider.go @@ -6,7 +6,7 @@ import ( "github.com/knadh/koanf" "github.com/mitchellh/mapstructure" - "github.com/authelia/authelia/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/configuration/schema" ) // Load the configuration given the provided options and sources. diff --git a/internal/configuration/provider_test.go b/internal/configuration/provider_test.go index 05cedfc77..d4fc155db 100644 --- a/internal/configuration/provider_test.go +++ b/internal/configuration/provider_test.go @@ -12,9 +12,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/authelia/authelia/internal/configuration/schema" - "github.com/authelia/authelia/internal/configuration/validator" - "github.com/authelia/authelia/internal/utils" + "github.com/authelia/authelia/v4/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/configuration/validator" + "github.com/authelia/authelia/v4/internal/utils" ) func TestShouldErrorSecretNotExist(t *testing.T) { diff --git a/internal/configuration/schema/validator_test.go b/internal/configuration/schema/validator_test.go index 2e1371b20..0ded4b7b7 100644 --- a/internal/configuration/schema/validator_test.go +++ b/internal/configuration/schema/validator_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/authelia/authelia/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/configuration/schema" ) type TestNestedStruct struct { diff --git a/internal/configuration/sources.go b/internal/configuration/sources.go index 90510ee2d..e10951517 100644 --- a/internal/configuration/sources.go +++ b/internal/configuration/sources.go @@ -9,8 +9,8 @@ import ( "github.com/knadh/koanf/providers/env" "github.com/knadh/koanf/providers/file" - "github.com/authelia/authelia/internal/configuration/schema" - "github.com/authelia/authelia/internal/configuration/validator" + "github.com/authelia/authelia/v4/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/configuration/validator" ) // NewYAMLFileSource returns a Source configured to load from a specified YAML path. If there is an issue accessing this diff --git a/internal/configuration/template_test.go b/internal/configuration/template_test.go index 113d272aa..49e6eeb64 100644 --- a/internal/configuration/template_test.go +++ b/internal/configuration/template_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/authelia/authelia/internal/utils" + "github.com/authelia/authelia/v4/internal/utils" ) func TestShouldGenerateConfiguration(t *testing.T) { diff --git a/internal/configuration/types.go b/internal/configuration/types.go index 68a49a721..c2d029c5e 100644 --- a/internal/configuration/types.go +++ b/internal/configuration/types.go @@ -3,7 +3,7 @@ package configuration import ( "github.com/knadh/koanf" - "github.com/authelia/authelia/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/configuration/schema" ) // Source is an abstract representation of a configuration Source implementation. diff --git a/internal/configuration/validator/access_control.go b/internal/configuration/validator/access_control.go index 3eae6f7f6..19d271f50 100644 --- a/internal/configuration/validator/access_control.go +++ b/internal/configuration/validator/access_control.go @@ -6,8 +6,8 @@ import ( "regexp" "strings" - "github.com/authelia/authelia/internal/configuration/schema" - "github.com/authelia/authelia/internal/utils" + "github.com/authelia/authelia/v4/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/utils" ) // IsPolicyValid check if policy is valid. diff --git a/internal/configuration/validator/access_control_test.go b/internal/configuration/validator/access_control_test.go index 5acaa874f..9a72ffe7b 100644 --- a/internal/configuration/validator/access_control_test.go +++ b/internal/configuration/validator/access_control_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" - "github.com/authelia/authelia/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/configuration/schema" ) type AccessControl struct { diff --git a/internal/configuration/validator/authentication.go b/internal/configuration/validator/authentication.go index 172dd57b0..13d71eafa 100644 --- a/internal/configuration/validator/authentication.go +++ b/internal/configuration/validator/authentication.go @@ -6,8 +6,8 @@ import ( "net/url" "strings" - "github.com/authelia/authelia/internal/configuration/schema" - "github.com/authelia/authelia/internal/utils" + "github.com/authelia/authelia/v4/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/utils" ) // ValidateAuthenticationBackend validates and updates the authentication backend configuration. diff --git a/internal/configuration/validator/authentication_test.go b/internal/configuration/validator/authentication_test.go index 151cf4662..aadc71659 100644 --- a/internal/configuration/validator/authentication_test.go +++ b/internal/configuration/validator/authentication_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - "github.com/authelia/authelia/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/configuration/schema" ) func TestShouldRaiseErrorWhenBothBackendsProvided(t *testing.T) { diff --git a/internal/configuration/validator/configuration.go b/internal/configuration/validator/configuration.go index b54dbaa46..d23325db0 100644 --- a/internal/configuration/validator/configuration.go +++ b/internal/configuration/validator/configuration.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "github.com/authelia/authelia/internal/configuration/schema" - "github.com/authelia/authelia/internal/utils" + "github.com/authelia/authelia/v4/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/utils" ) // ValidateConfiguration and adapt the configuration read from file. diff --git a/internal/configuration/validator/configuration_test.go b/internal/configuration/validator/configuration_test.go index 7275c8a49..39796abfd 100644 --- a/internal/configuration/validator/configuration_test.go +++ b/internal/configuration/validator/configuration_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/authelia/authelia/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/configuration/schema" ) func newDefaultConfig() schema.Configuration { diff --git a/internal/configuration/validator/identity_providers.go b/internal/configuration/validator/identity_providers.go index 525b86cf7..7a50a3db1 100644 --- a/internal/configuration/validator/identity_providers.go +++ b/internal/configuration/validator/identity_providers.go @@ -6,8 +6,8 @@ import ( "strings" "time" - "github.com/authelia/authelia/internal/configuration/schema" - "github.com/authelia/authelia/internal/utils" + "github.com/authelia/authelia/v4/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/utils" ) // ValidateIdentityProviders validates and update IdentityProviders configuration. diff --git a/internal/configuration/validator/identity_providers_test.go b/internal/configuration/validator/identity_providers_test.go index 934810abb..11bb63caf 100644 --- a/internal/configuration/validator/identity_providers_test.go +++ b/internal/configuration/validator/identity_providers_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/authelia/authelia/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/configuration/schema" ) func TestShouldRaiseErrorWhenInvalidOIDCServerConfiguration(t *testing.T) { diff --git a/internal/configuration/validator/keys.go b/internal/configuration/validator/keys.go index bc73f7cf9..4291447f8 100644 --- a/internal/configuration/validator/keys.go +++ b/internal/configuration/validator/keys.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" - "github.com/authelia/authelia/internal/configuration/schema" - "github.com/authelia/authelia/internal/utils" + "github.com/authelia/authelia/v4/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/utils" ) // ValidateKeys determines if all provided keys are valid. diff --git a/internal/configuration/validator/keys_test.go b/internal/configuration/validator/keys_test.go index 179dbac3a..23153666b 100644 --- a/internal/configuration/validator/keys_test.go +++ b/internal/configuration/validator/keys_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/authelia/authelia/internal/configuration/schema" - "github.com/authelia/authelia/internal/utils" + "github.com/authelia/authelia/v4/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/utils" ) func TestShouldValidateGoodKeys(t *testing.T) { diff --git a/internal/configuration/validator/logging.go b/internal/configuration/validator/logging.go index 710149317..4a0cff809 100644 --- a/internal/configuration/validator/logging.go +++ b/internal/configuration/validator/logging.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/authelia/authelia/internal/configuration/schema" - "github.com/authelia/authelia/internal/utils" + "github.com/authelia/authelia/v4/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/utils" ) // ValidateLogging validates the logging configuration. diff --git a/internal/configuration/validator/logging_test.go b/internal/configuration/validator/logging_test.go index 354c5db62..fefaa0550 100644 --- a/internal/configuration/validator/logging_test.go +++ b/internal/configuration/validator/logging_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/authelia/authelia/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/configuration/schema" ) func TestShouldSetDefaultLoggingValues(t *testing.T) { diff --git a/internal/configuration/validator/notifier.go b/internal/configuration/validator/notifier.go index f7e745872..261743e93 100644 --- a/internal/configuration/validator/notifier.go +++ b/internal/configuration/validator/notifier.go @@ -3,7 +3,7 @@ package validator import ( "fmt" - "github.com/authelia/authelia/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/configuration/schema" ) // ValidateNotifier validates and update notifier configuration. diff --git a/internal/configuration/validator/notifier_test.go b/internal/configuration/validator/notifier_test.go index 54097d206..0a48aa947 100644 --- a/internal/configuration/validator/notifier_test.go +++ b/internal/configuration/validator/notifier_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/suite" - "github.com/authelia/authelia/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/configuration/schema" ) type NotifierSuite struct { diff --git a/internal/configuration/validator/regulation.go b/internal/configuration/validator/regulation.go index 037d386a9..88c6e7418 100644 --- a/internal/configuration/validator/regulation.go +++ b/internal/configuration/validator/regulation.go @@ -3,8 +3,8 @@ package validator import ( "fmt" - "github.com/authelia/authelia/internal/configuration/schema" - "github.com/authelia/authelia/internal/utils" + "github.com/authelia/authelia/v4/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/utils" ) // ValidateRegulation validates and update regulator configuration. diff --git a/internal/configuration/validator/regulation_test.go b/internal/configuration/validator/regulation_test.go index 120d5983f..a2feb710f 100644 --- a/internal/configuration/validator/regulation_test.go +++ b/internal/configuration/validator/regulation_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/authelia/authelia/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/configuration/schema" ) func newDefaultRegulationConfig() schema.RegulationConfiguration { diff --git a/internal/configuration/validator/server.go b/internal/configuration/validator/server.go index 8aa4d9fcf..6e62ea780 100644 --- a/internal/configuration/validator/server.go +++ b/internal/configuration/validator/server.go @@ -5,8 +5,8 @@ import ( "path" "strings" - "github.com/authelia/authelia/internal/configuration/schema" - "github.com/authelia/authelia/internal/utils" + "github.com/authelia/authelia/v4/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/utils" ) // ValidateServer checks a server configuration is correct. diff --git a/internal/configuration/validator/server_test.go b/internal/configuration/validator/server_test.go index 55230ff3e..86cfdd2ce 100644 --- a/internal/configuration/validator/server_test.go +++ b/internal/configuration/validator/server_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/authelia/authelia/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/configuration/schema" ) func TestShouldSetDefaultServerValues(t *testing.T) { diff --git a/internal/configuration/validator/session.go b/internal/configuration/validator/session.go index eabef1104..394306c9b 100644 --- a/internal/configuration/validator/session.go +++ b/internal/configuration/validator/session.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" - "github.com/authelia/authelia/internal/configuration/schema" - "github.com/authelia/authelia/internal/utils" + "github.com/authelia/authelia/v4/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/utils" ) // ValidateSession validates and update session configuration. diff --git a/internal/configuration/validator/session_test.go b/internal/configuration/validator/session_test.go index 9b78bfd1c..b3e612a0e 100644 --- a/internal/configuration/validator/session_test.go +++ b/internal/configuration/validator/session_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/authelia/authelia/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/configuration/schema" ) func newDefaultSessionConfig() schema.SessionConfiguration { diff --git a/internal/configuration/validator/storage.go b/internal/configuration/validator/storage.go index e130132ac..8c303d0a1 100644 --- a/internal/configuration/validator/storage.go +++ b/internal/configuration/validator/storage.go @@ -3,7 +3,7 @@ package validator import ( "errors" - "github.com/authelia/authelia/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/configuration/schema" ) // ValidateStorage validates storage configuration. diff --git a/internal/configuration/validator/storage_test.go b/internal/configuration/validator/storage_test.go index dc2550924..fcec6a836 100644 --- a/internal/configuration/validator/storage_test.go +++ b/internal/configuration/validator/storage_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/suite" - "github.com/authelia/authelia/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/configuration/schema" ) type StorageSuite struct { diff --git a/internal/configuration/validator/theme.go b/internal/configuration/validator/theme.go index 6fdaa1066..758fe4546 100644 --- a/internal/configuration/validator/theme.go +++ b/internal/configuration/validator/theme.go @@ -4,7 +4,7 @@ import ( "fmt" "regexp" - "github.com/authelia/authelia/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/configuration/schema" ) // ValidateTheme validates and update Theme configuration. diff --git a/internal/configuration/validator/theme_test.go b/internal/configuration/validator/theme_test.go index 1519b49d1..8ffd89be4 100644 --- a/internal/configuration/validator/theme_test.go +++ b/internal/configuration/validator/theme_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/suite" - "github.com/authelia/authelia/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/configuration/schema" ) type Theme struct { diff --git a/internal/configuration/validator/totp.go b/internal/configuration/validator/totp.go index cbf91b89e..5a394b0c8 100644 --- a/internal/configuration/validator/totp.go +++ b/internal/configuration/validator/totp.go @@ -3,7 +3,7 @@ package validator import ( "fmt" - "github.com/authelia/authelia/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/configuration/schema" ) // ValidateTOTP validates and update TOTP configuration. diff --git a/internal/configuration/validator/totp_test.go b/internal/configuration/validator/totp_test.go index c95759f4e..925217bca 100644 --- a/internal/configuration/validator/totp_test.go +++ b/internal/configuration/validator/totp_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/authelia/authelia/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/configuration/schema" ) func TestShouldSetDefaultTOTPValues(t *testing.T) { diff --git a/internal/duo/duo.go b/internal/duo/duo.go index 7bf80806c..1d90e43c4 100644 --- a/internal/duo/duo.go +++ b/internal/duo/duo.go @@ -6,7 +6,7 @@ import ( duoapi "github.com/duosecurity/duo_api_golang" - "github.com/authelia/authelia/internal/middlewares" + "github.com/authelia/authelia/v4/internal/middlewares" ) // NewDuoAPI create duo API instance. diff --git a/internal/duo/types.go b/internal/duo/types.go index bebb000d8..4d7b45e71 100644 --- a/internal/duo/types.go +++ b/internal/duo/types.go @@ -5,7 +5,7 @@ import ( duoapi "github.com/duosecurity/duo_api_golang" - "github.com/authelia/authelia/internal/middlewares" + "github.com/authelia/authelia/v4/internal/middlewares" ) // API interface wrapping duo api library for testing purpose. diff --git a/internal/handlers/handler_checks_safe_redirection.go b/internal/handlers/handler_checks_safe_redirection.go index a621a9523..49d33190e 100644 --- a/internal/handlers/handler_checks_safe_redirection.go +++ b/internal/handlers/handler_checks_safe_redirection.go @@ -3,9 +3,9 @@ package handlers import ( "fmt" - "github.com/authelia/authelia/internal/authentication" - "github.com/authelia/authelia/internal/middlewares" - "github.com/authelia/authelia/internal/utils" + "github.com/authelia/authelia/v4/internal/authentication" + "github.com/authelia/authelia/v4/internal/middlewares" + "github.com/authelia/authelia/v4/internal/utils" ) // CheckSafeRedirection handler checking whether the redirection to a given URL provided in body is safe. diff --git a/internal/handlers/handler_checks_safe_redirection_test.go b/internal/handlers/handler_checks_safe_redirection_test.go index 26b3360b1..acae2b0c9 100644 --- a/internal/handlers/handler_checks_safe_redirection_test.go +++ b/internal/handlers/handler_checks_safe_redirection_test.go @@ -5,9 +5,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/authelia/authelia/internal/authentication" - "github.com/authelia/authelia/internal/mocks" - "github.com/authelia/authelia/internal/session" + "github.com/authelia/authelia/v4/internal/authentication" + "github.com/authelia/authelia/v4/internal/mocks" + "github.com/authelia/authelia/v4/internal/session" ) var exampleDotComDomain = "example.com" diff --git a/internal/handlers/handler_configuration.go b/internal/handlers/handler_configuration.go index 9520c62ca..7d5e35ba1 100644 --- a/internal/handlers/handler_configuration.go +++ b/internal/handlers/handler_configuration.go @@ -1,8 +1,8 @@ package handlers import ( - "github.com/authelia/authelia/internal/authentication" - "github.com/authelia/authelia/internal/middlewares" + "github.com/authelia/authelia/v4/internal/authentication" + "github.com/authelia/authelia/v4/internal/middlewares" ) // ConfigurationBody the content returned by the configuration endpoint. diff --git a/internal/handlers/handler_configuration_test.go b/internal/handlers/handler_configuration_test.go index 9340584de..24978f233 100644 --- a/internal/handlers/handler_configuration_test.go +++ b/internal/handlers/handler_configuration_test.go @@ -5,9 +5,9 @@ import ( "github.com/stretchr/testify/suite" - "github.com/authelia/authelia/internal/authorization" - "github.com/authelia/authelia/internal/configuration/schema" - "github.com/authelia/authelia/internal/mocks" + "github.com/authelia/authelia/v4/internal/authorization" + "github.com/authelia/authelia/v4/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/mocks" ) type SecondFactorAvailableMethodsFixture struct { diff --git a/internal/handlers/handler_firstfactor.go b/internal/handlers/handler_firstfactor.go index 841813763..01dcc368c 100644 --- a/internal/handlers/handler_firstfactor.go +++ b/internal/handlers/handler_firstfactor.go @@ -7,9 +7,9 @@ import ( "sync" "time" - "github.com/authelia/authelia/internal/middlewares" - "github.com/authelia/authelia/internal/regulation" - "github.com/authelia/authelia/internal/session" + "github.com/authelia/authelia/v4/internal/middlewares" + "github.com/authelia/authelia/v4/internal/regulation" + "github.com/authelia/authelia/v4/internal/session" ) func movingAverageIteration(value time.Duration, successful bool, movingAverageCursor *int, execDurationMovingAverage *[]time.Duration, mutex sync.Locker) float64 { diff --git a/internal/handlers/handler_firstfactor_test.go b/internal/handlers/handler_firstfactor_test.go index 1642c7319..fab193e97 100644 --- a/internal/handlers/handler_firstfactor_test.go +++ b/internal/handlers/handler_firstfactor_test.go @@ -10,11 +10,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" - "github.com/authelia/authelia/internal/authentication" - "github.com/authelia/authelia/internal/authorization" - "github.com/authelia/authelia/internal/configuration/schema" - "github.com/authelia/authelia/internal/mocks" - "github.com/authelia/authelia/internal/models" + "github.com/authelia/authelia/v4/internal/authentication" + "github.com/authelia/authelia/v4/internal/authorization" + "github.com/authelia/authelia/v4/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/mocks" + "github.com/authelia/authelia/v4/internal/models" ) type FirstFactorSuite struct { diff --git a/internal/handlers/handler_health.go b/internal/handlers/handler_health.go index 7a35f2875..13fd4af08 100644 --- a/internal/handlers/handler_health.go +++ b/internal/handlers/handler_health.go @@ -1,7 +1,7 @@ package handlers import ( - "github.com/authelia/authelia/internal/middlewares" + "github.com/authelia/authelia/v4/internal/middlewares" ) // HealthGet can be used by health checks. diff --git a/internal/handlers/handler_logout.go b/internal/handlers/handler_logout.go index 885aeb120..5b5579439 100644 --- a/internal/handlers/handler_logout.go +++ b/internal/handlers/handler_logout.go @@ -4,8 +4,8 @@ import ( "fmt" "net/url" - "github.com/authelia/authelia/internal/middlewares" - "github.com/authelia/authelia/internal/utils" + "github.com/authelia/authelia/v4/internal/middlewares" + "github.com/authelia/authelia/v4/internal/utils" ) type logoutBody struct { diff --git a/internal/handlers/handler_logout_test.go b/internal/handlers/handler_logout_test.go index 86e212af3..b8ab630eb 100644 --- a/internal/handlers/handler_logout_test.go +++ b/internal/handlers/handler_logout_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - "github.com/authelia/authelia/internal/mocks" + "github.com/authelia/authelia/v4/internal/mocks" ) type LogoutSuite struct { diff --git a/internal/handlers/handler_oidc_authorization.go b/internal/handlers/handler_oidc_authorization.go index d03051b33..9c04a52ad 100644 --- a/internal/handlers/handler_oidc_authorization.go +++ b/internal/handlers/handler_oidc_authorization.go @@ -10,11 +10,11 @@ import ( "github.com/ory/fosite/handler/openid" "github.com/ory/fosite/token/jwt" - "github.com/authelia/authelia/internal/logging" - "github.com/authelia/authelia/internal/middlewares" - "github.com/authelia/authelia/internal/oidc" - "github.com/authelia/authelia/internal/session" - "github.com/authelia/authelia/internal/utils" + "github.com/authelia/authelia/v4/internal/logging" + "github.com/authelia/authelia/v4/internal/middlewares" + "github.com/authelia/authelia/v4/internal/oidc" + "github.com/authelia/authelia/v4/internal/session" + "github.com/authelia/authelia/v4/internal/utils" ) func oidcAuthorization(ctx *middlewares.AutheliaCtx, rw http.ResponseWriter, r *http.Request) { diff --git a/internal/handlers/handler_oidc_consent.go b/internal/handlers/handler_oidc_consent.go index 5beca47b9..7d84493ff 100644 --- a/internal/handlers/handler_oidc_consent.go +++ b/internal/handlers/handler_oidc_consent.go @@ -4,7 +4,7 @@ import ( "encoding/json" "fmt" - "github.com/authelia/authelia/internal/middlewares" + "github.com/authelia/authelia/v4/internal/middlewares" ) func oidcConsent(ctx *middlewares.AutheliaCtx) { diff --git a/internal/handlers/handler_oidc_introspection.go b/internal/handlers/handler_oidc_introspection.go index 0df4a0afe..227eda170 100644 --- a/internal/handlers/handler_oidc_introspection.go +++ b/internal/handlers/handler_oidc_introspection.go @@ -3,7 +3,7 @@ package handlers import ( "net/http" - "github.com/authelia/authelia/internal/middlewares" + "github.com/authelia/authelia/v4/internal/middlewares" ) func oidcIntrospection(ctx *middlewares.AutheliaCtx, rw http.ResponseWriter, req *http.Request) { diff --git a/internal/handlers/handler_oidc_jwks.go b/internal/handlers/handler_oidc_jwks.go index 0ac128bda..2ba875681 100644 --- a/internal/handlers/handler_oidc_jwks.go +++ b/internal/handlers/handler_oidc_jwks.go @@ -3,7 +3,7 @@ package handlers import ( "encoding/json" - "github.com/authelia/authelia/internal/middlewares" + "github.com/authelia/authelia/v4/internal/middlewares" ) func oidcJWKs(ctx *middlewares.AutheliaCtx) { diff --git a/internal/handlers/handler_oidc_revocation.go b/internal/handlers/handler_oidc_revocation.go index b50e6989e..c4021bdcf 100644 --- a/internal/handlers/handler_oidc_revocation.go +++ b/internal/handlers/handler_oidc_revocation.go @@ -3,7 +3,7 @@ package handlers import ( "net/http" - "github.com/authelia/authelia/internal/middlewares" + "github.com/authelia/authelia/v4/internal/middlewares" ) func oidcRevocation(ctx *middlewares.AutheliaCtx, rw http.ResponseWriter, req *http.Request) { diff --git a/internal/handlers/handler_oidc_token.go b/internal/handlers/handler_oidc_token.go index d33d80aeb..2ad2efdb4 100644 --- a/internal/handlers/handler_oidc_token.go +++ b/internal/handlers/handler_oidc_token.go @@ -5,7 +5,7 @@ import ( "github.com/ory/fosite" - "github.com/authelia/authelia/internal/middlewares" + "github.com/authelia/authelia/v4/internal/middlewares" ) func oidcToken(ctx *middlewares.AutheliaCtx, rw http.ResponseWriter, req *http.Request) { diff --git a/internal/handlers/handler_oidc_userinfo.go b/internal/handlers/handler_oidc_userinfo.go index 3811edf54..ff176f60b 100644 --- a/internal/handlers/handler_oidc_userinfo.go +++ b/internal/handlers/handler_oidc_userinfo.go @@ -10,8 +10,8 @@ import ( "github.com/ory/fosite/token/jwt" "github.com/pkg/errors" - "github.com/authelia/authelia/internal/middlewares" - "github.com/authelia/authelia/internal/oidc" + "github.com/authelia/authelia/v4/internal/middlewares" + "github.com/authelia/authelia/v4/internal/oidc" ) func oidcUserinfo(ctx *middlewares.AutheliaCtx, rw http.ResponseWriter, req *http.Request) { diff --git a/internal/handlers/handler_oidc_wellknown.go b/internal/handlers/handler_oidc_wellknown.go index 153c60418..097ad334e 100644 --- a/internal/handlers/handler_oidc_wellknown.go +++ b/internal/handlers/handler_oidc_wellknown.go @@ -6,8 +6,8 @@ import ( "github.com/valyala/fasthttp" - "github.com/authelia/authelia/internal/middlewares" - "github.com/authelia/authelia/internal/oidc" + "github.com/authelia/authelia/v4/internal/middlewares" + "github.com/authelia/authelia/v4/internal/oidc" ) func oidcWellKnown(ctx *middlewares.AutheliaCtx) { diff --git a/internal/handlers/handler_register_totp.go b/internal/handlers/handler_register_totp.go index 3a7fd0b59..8ce19274e 100644 --- a/internal/handlers/handler_register_totp.go +++ b/internal/handlers/handler_register_totp.go @@ -5,8 +5,8 @@ import ( "github.com/pquerna/otp/totp" - "github.com/authelia/authelia/internal/middlewares" - "github.com/authelia/authelia/internal/session" + "github.com/authelia/authelia/v4/internal/middlewares" + "github.com/authelia/authelia/v4/internal/session" ) // identityRetrieverFromSession retriever computing the identity from the cookie session. diff --git a/internal/handlers/handler_register_u2f_step1.go b/internal/handlers/handler_register_u2f_step1.go index c1a13a777..b0adfd543 100644 --- a/internal/handlers/handler_register_u2f_step1.go +++ b/internal/handlers/handler_register_u2f_step1.go @@ -5,7 +5,7 @@ import ( "github.com/tstranex/u2f" - "github.com/authelia/authelia/internal/middlewares" + "github.com/authelia/authelia/v4/internal/middlewares" ) var u2fConfig = &u2f.Config{ diff --git a/internal/handlers/handler_register_u2f_step1_test.go b/internal/handlers/handler_register_u2f_step1_test.go index 02a9581fd..ba8f214a5 100644 --- a/internal/handlers/handler_register_u2f_step1_test.go +++ b/internal/handlers/handler_register_u2f_step1_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - "github.com/authelia/authelia/internal/middlewares" - "github.com/authelia/authelia/internal/mocks" + "github.com/authelia/authelia/v4/internal/middlewares" + "github.com/authelia/authelia/v4/internal/mocks" ) type HandlerRegisterU2FStep1Suite struct { diff --git a/internal/handlers/handler_register_u2f_step2.go b/internal/handlers/handler_register_u2f_step2.go index 308466344..c3efc08d4 100644 --- a/internal/handlers/handler_register_u2f_step2.go +++ b/internal/handlers/handler_register_u2f_step2.go @@ -6,7 +6,7 @@ import ( "github.com/tstranex/u2f" - "github.com/authelia/authelia/internal/middlewares" + "github.com/authelia/authelia/v4/internal/middlewares" ) // SecondFactorU2FRegister handler validating the client has successfully validated the challenge diff --git a/internal/handlers/handler_reset_password_step1.go b/internal/handlers/handler_reset_password_step1.go index b70017823..3c3926543 100644 --- a/internal/handlers/handler_reset_password_step1.go +++ b/internal/handlers/handler_reset_password_step1.go @@ -4,8 +4,8 @@ import ( "encoding/json" "fmt" - "github.com/authelia/authelia/internal/middlewares" - "github.com/authelia/authelia/internal/session" + "github.com/authelia/authelia/v4/internal/middlewares" + "github.com/authelia/authelia/v4/internal/session" ) func identityRetrieverFromStorage(ctx *middlewares.AutheliaCtx) (*session.Identity, error) { diff --git a/internal/handlers/handler_reset_password_step2.go b/internal/handlers/handler_reset_password_step2.go index c79723142..751ca3b29 100644 --- a/internal/handlers/handler_reset_password_step2.go +++ b/internal/handlers/handler_reset_password_step2.go @@ -3,8 +3,8 @@ package handlers import ( "fmt" - "github.com/authelia/authelia/internal/middlewares" - "github.com/authelia/authelia/internal/utils" + "github.com/authelia/authelia/v4/internal/middlewares" + "github.com/authelia/authelia/v4/internal/utils" ) // ResetPasswordPost handler for resetting passwords. diff --git a/internal/handlers/handler_sign_duo.go b/internal/handlers/handler_sign_duo.go index ab94e1366..5ae5b15cd 100644 --- a/internal/handlers/handler_sign_duo.go +++ b/internal/handlers/handler_sign_duo.go @@ -4,8 +4,8 @@ import ( "fmt" "net/url" - "github.com/authelia/authelia/internal/duo" - "github.com/authelia/authelia/internal/middlewares" + "github.com/authelia/authelia/v4/internal/duo" + "github.com/authelia/authelia/v4/internal/middlewares" ) // SecondFactorDuoPost handler for sending a push notification via duo api. diff --git a/internal/handlers/handler_sign_duo_test.go b/internal/handlers/handler_sign_duo_test.go index 4a61c814f..cd7d0a4bb 100644 --- a/internal/handlers/handler_sign_duo_test.go +++ b/internal/handlers/handler_sign_duo_test.go @@ -12,8 +12,8 @@ import ( "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - "github.com/authelia/authelia/internal/duo" - "github.com/authelia/authelia/internal/mocks" + "github.com/authelia/authelia/v4/internal/duo" + "github.com/authelia/authelia/v4/internal/mocks" ) type SecondFactorDuoPostSuite struct { diff --git a/internal/handlers/handler_sign_totp.go b/internal/handlers/handler_sign_totp.go index 20fcbc899..0cecb4fbf 100644 --- a/internal/handlers/handler_sign_totp.go +++ b/internal/handlers/handler_sign_totp.go @@ -3,7 +3,7 @@ package handlers import ( "fmt" - "github.com/authelia/authelia/internal/middlewares" + "github.com/authelia/authelia/v4/internal/middlewares" ) // SecondFactorTOTPPost validate the TOTP passcode provided by the user. diff --git a/internal/handlers/handler_sign_totp_test.go b/internal/handlers/handler_sign_totp_test.go index 233a238e9..2220fea59 100644 --- a/internal/handlers/handler_sign_totp_test.go +++ b/internal/handlers/handler_sign_totp_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/suite" "github.com/tstranex/u2f" - "github.com/authelia/authelia/internal/mocks" - "github.com/authelia/authelia/internal/session" + "github.com/authelia/authelia/v4/internal/mocks" + "github.com/authelia/authelia/v4/internal/session" ) type HandlerSignTOTPSuite struct { diff --git a/internal/handlers/handler_sign_u2f_step1.go b/internal/handlers/handler_sign_u2f_step1.go index 7c83bfd58..70c458809 100644 --- a/internal/handlers/handler_sign_u2f_step1.go +++ b/internal/handlers/handler_sign_u2f_step1.go @@ -6,9 +6,9 @@ import ( "github.com/tstranex/u2f" - "github.com/authelia/authelia/internal/middlewares" - "github.com/authelia/authelia/internal/session" - "github.com/authelia/authelia/internal/storage" + "github.com/authelia/authelia/v4/internal/middlewares" + "github.com/authelia/authelia/v4/internal/session" + "github.com/authelia/authelia/v4/internal/storage" ) // SecondFactorU2FSignGet handler for initiating a signing request. diff --git a/internal/handlers/handler_sign_u2f_step1_test.go b/internal/handlers/handler_sign_u2f_step1_test.go index 56099941c..909feaa5d 100644 --- a/internal/handlers/handler_sign_u2f_step1_test.go +++ b/internal/handlers/handler_sign_u2f_step1_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" - "github.com/authelia/authelia/internal/mocks" + "github.com/authelia/authelia/v4/internal/mocks" ) type HandlerSignU2FStep1Suite struct { diff --git a/internal/handlers/handler_sign_u2f_step2.go b/internal/handlers/handler_sign_u2f_step2.go index 54dcd5f64..f7e8cad71 100644 --- a/internal/handlers/handler_sign_u2f_step2.go +++ b/internal/handlers/handler_sign_u2f_step2.go @@ -3,7 +3,7 @@ package handlers import ( "fmt" - "github.com/authelia/authelia/internal/middlewares" + "github.com/authelia/authelia/v4/internal/middlewares" ) // SecondFactorU2FSignPost handler for completing a signing request. diff --git a/internal/handlers/handler_sign_u2f_step2_test.go b/internal/handlers/handler_sign_u2f_step2_test.go index 52b7c9073..7ef81fb8a 100644 --- a/internal/handlers/handler_sign_u2f_step2_test.go +++ b/internal/handlers/handler_sign_u2f_step2_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/suite" "github.com/tstranex/u2f" - "github.com/authelia/authelia/internal/mocks" - "github.com/authelia/authelia/internal/session" + "github.com/authelia/authelia/v4/internal/mocks" + "github.com/authelia/authelia/v4/internal/session" ) type HandlerSignU2FStep2Suite struct { diff --git a/internal/handlers/handler_state.go b/internal/handlers/handler_state.go index 83ed75327..8a014773d 100644 --- a/internal/handlers/handler_state.go +++ b/internal/handlers/handler_state.go @@ -1,7 +1,7 @@ package handlers import ( - "github.com/authelia/authelia/internal/middlewares" + "github.com/authelia/authelia/v4/internal/middlewares" ) // StateGet is the handler serving the user state. diff --git a/internal/handlers/handler_state_test.go b/internal/handlers/handler_state_test.go index 4708e6d92..ebec3cd04 100644 --- a/internal/handlers/handler_state_test.go +++ b/internal/handlers/handler_state_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - "github.com/authelia/authelia/internal/authentication" - "github.com/authelia/authelia/internal/mocks" + "github.com/authelia/authelia/v4/internal/authentication" + "github.com/authelia/authelia/v4/internal/mocks" ) type StateGetSuite struct { diff --git a/internal/handlers/handler_user_info.go b/internal/handlers/handler_user_info.go index ecc3c58a7..d9f2e43c5 100644 --- a/internal/handlers/handler_user_info.go +++ b/internal/handlers/handler_user_info.go @@ -7,10 +7,10 @@ import ( "github.com/sirupsen/logrus" - "github.com/authelia/authelia/internal/authentication" - "github.com/authelia/authelia/internal/middlewares" - "github.com/authelia/authelia/internal/storage" - "github.com/authelia/authelia/internal/utils" + "github.com/authelia/authelia/v4/internal/authentication" + "github.com/authelia/authelia/v4/internal/middlewares" + "github.com/authelia/authelia/v4/internal/storage" + "github.com/authelia/authelia/v4/internal/utils" ) func loadInfo(username string, storageProvider storage.Provider, userInfo *UserInfo, logger *logrus.Entry) []error { diff --git a/internal/handlers/handler_user_info_test.go b/internal/handlers/handler_user_info_test.go index 691f919b5..6e4e60a6f 100644 --- a/internal/handlers/handler_user_info_test.go +++ b/internal/handlers/handler_user_info_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - "github.com/authelia/authelia/internal/mocks" - "github.com/authelia/authelia/internal/storage" + "github.com/authelia/authelia/v4/internal/mocks" + "github.com/authelia/authelia/v4/internal/storage" ) type FetchSuite struct { diff --git a/internal/handlers/handler_verify.go b/internal/handlers/handler_verify.go index 38c5f9762..d8b8106e0 100644 --- a/internal/handlers/handler_verify.go +++ b/internal/handlers/handler_verify.go @@ -11,12 +11,12 @@ import ( "github.com/valyala/fasthttp" - "github.com/authelia/authelia/internal/authentication" - "github.com/authelia/authelia/internal/authorization" - "github.com/authelia/authelia/internal/configuration/schema" - "github.com/authelia/authelia/internal/middlewares" - "github.com/authelia/authelia/internal/session" - "github.com/authelia/authelia/internal/utils" + "github.com/authelia/authelia/v4/internal/authentication" + "github.com/authelia/authelia/v4/internal/authorization" + "github.com/authelia/authelia/v4/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/middlewares" + "github.com/authelia/authelia/v4/internal/session" + "github.com/authelia/authelia/v4/internal/utils" ) func isURLUnderProtectedDomain(url *url.URL, domain string) bool { diff --git a/internal/handlers/handler_verify_test.go b/internal/handlers/handler_verify_test.go index cc4b4f6d2..c1c7e876d 100644 --- a/internal/handlers/handler_verify_test.go +++ b/internal/handlers/handler_verify_test.go @@ -13,12 +13,12 @@ import ( "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - "github.com/authelia/authelia/internal/authentication" - "github.com/authelia/authelia/internal/authorization" - "github.com/authelia/authelia/internal/configuration/schema" - "github.com/authelia/authelia/internal/mocks" - "github.com/authelia/authelia/internal/session" - "github.com/authelia/authelia/internal/utils" + "github.com/authelia/authelia/v4/internal/authentication" + "github.com/authelia/authelia/v4/internal/authorization" + "github.com/authelia/authelia/v4/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/mocks" + "github.com/authelia/authelia/v4/internal/session" + "github.com/authelia/authelia/v4/internal/utils" ) var verifyGetCfg = schema.AuthenticationBackendConfiguration{ diff --git a/internal/handlers/oidc.go b/internal/handlers/oidc.go index 18feac82c..633e85195 100644 --- a/internal/handlers/oidc.go +++ b/internal/handlers/oidc.go @@ -4,9 +4,9 @@ import ( "github.com/ory/fosite/handler/openid" "github.com/ory/fosite/token/jwt" - "github.com/authelia/authelia/internal/oidc" - "github.com/authelia/authelia/internal/session" - "github.com/authelia/authelia/internal/utils" + "github.com/authelia/authelia/v4/internal/oidc" + "github.com/authelia/authelia/v4/internal/session" + "github.com/authelia/authelia/v4/internal/utils" ) // isConsentMissing compares the requestedScopes and requestedAudience to the workflows diff --git a/internal/handlers/oidc_register.go b/internal/handlers/oidc_register.go index a7096bc44..3b9d78a2c 100644 --- a/internal/handlers/oidc_register.go +++ b/internal/handlers/oidc_register.go @@ -3,7 +3,7 @@ package handlers import ( "github.com/fasthttp/router" - "github.com/authelia/authelia/internal/middlewares" + "github.com/authelia/authelia/v4/internal/middlewares" ) // RegisterOIDC registers the handlers with the fasthttp *router.Router. TODO: Add paths for UserInfo, Flush, Logout. diff --git a/internal/handlers/oidc_test.go b/internal/handlers/oidc_test.go index 7e77e6a39..e80c84b25 100644 --- a/internal/handlers/oidc_test.go +++ b/internal/handlers/oidc_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/authelia/authelia/internal/session" + "github.com/authelia/authelia/v4/internal/session" ) func TestShouldDetectIfConsentIsMissing(t *testing.T) { diff --git a/internal/handlers/response.go b/internal/handlers/response.go index 9eaeec605..a3f55b9c6 100644 --- a/internal/handlers/response.go +++ b/internal/handlers/response.go @@ -6,9 +6,9 @@ import ( "github.com/valyala/fasthttp" - "github.com/authelia/authelia/internal/authorization" - "github.com/authelia/authelia/internal/middlewares" - "github.com/authelia/authelia/internal/utils" + "github.com/authelia/authelia/v4/internal/authorization" + "github.com/authelia/authelia/v4/internal/middlewares" + "github.com/authelia/authelia/v4/internal/utils" ) // handleOIDCWorkflowResponse handle the redirection upon authentication in the OIDC workflow. diff --git a/internal/handlers/types.go b/internal/handlers/types.go index 7cdff2463..2038108a7 100644 --- a/internal/handlers/types.go +++ b/internal/handlers/types.go @@ -3,7 +3,7 @@ package handlers import ( "github.com/tstranex/u2f" - "github.com/authelia/authelia/internal/authentication" + "github.com/authelia/authelia/v4/internal/authentication" ) // MethodList is the list of available methods. diff --git a/internal/logging/logger.go b/internal/logging/logger.go index 5193863c7..9cd10f121 100644 --- a/internal/logging/logger.go +++ b/internal/logging/logger.go @@ -7,7 +7,7 @@ import ( logrus_stack "github.com/Gurpartap/logrus-stack" "github.com/sirupsen/logrus" - "github.com/authelia/authelia/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/configuration/schema" ) // Logger returns the standard logrus logger. diff --git a/internal/logging/logger_test.go b/internal/logging/logger_test.go index fbcdfe151..39633acec 100644 --- a/internal/logging/logger_test.go +++ b/internal/logging/logger_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/authelia/authelia/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/configuration/schema" ) func TestShouldWriteLogsToFile(t *testing.T) { diff --git a/internal/middlewares/authelia_context.go b/internal/middlewares/authelia_context.go index 5444f9b77..1d5af2968 100644 --- a/internal/middlewares/authelia_context.go +++ b/internal/middlewares/authelia_context.go @@ -12,9 +12,9 @@ import ( "github.com/sirupsen/logrus" "github.com/valyala/fasthttp" - "github.com/authelia/authelia/internal/configuration/schema" - "github.com/authelia/authelia/internal/session" - "github.com/authelia/authelia/internal/utils" + "github.com/authelia/authelia/v4/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/session" + "github.com/authelia/authelia/v4/internal/utils" ) // NewRequestLogger create a new request logger for the given request. diff --git a/internal/middlewares/authelia_context_test.go b/internal/middlewares/authelia_context_test.go index e73e1cc84..f5ea62813 100644 --- a/internal/middlewares/authelia_context_test.go +++ b/internal/middlewares/authelia_context_test.go @@ -8,10 +8,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/valyala/fasthttp" - "github.com/authelia/authelia/internal/configuration/schema" - "github.com/authelia/authelia/internal/middlewares" - "github.com/authelia/authelia/internal/mocks" - "github.com/authelia/authelia/internal/session" + "github.com/authelia/authelia/v4/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/middlewares" + "github.com/authelia/authelia/v4/internal/mocks" + "github.com/authelia/authelia/v4/internal/session" ) func TestShouldCallNextWithAutheliaCtx(t *testing.T) { diff --git a/internal/middlewares/identity_verification.go b/internal/middlewares/identity_verification.go index d52babca1..c856ee023 100644 --- a/internal/middlewares/identity_verification.go +++ b/internal/middlewares/identity_verification.go @@ -8,7 +8,7 @@ import ( "github.com/golang-jwt/jwt/v4" - "github.com/authelia/authelia/internal/templates" + "github.com/authelia/authelia/v4/internal/templates" ) // IdentityVerificationStart the handler for initiating the identity validation process. diff --git a/internal/middlewares/identity_verification_test.go b/internal/middlewares/identity_verification_test.go index 764042376..0be80afc2 100644 --- a/internal/middlewares/identity_verification_test.go +++ b/internal/middlewares/identity_verification_test.go @@ -10,9 +10,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" - "github.com/authelia/authelia/internal/middlewares" - "github.com/authelia/authelia/internal/mocks" - "github.com/authelia/authelia/internal/session" + "github.com/authelia/authelia/v4/internal/middlewares" + "github.com/authelia/authelia/v4/internal/mocks" + "github.com/authelia/authelia/v4/internal/session" ) const testJWTSecret = "abc" diff --git a/internal/middlewares/require_first_factor.go b/internal/middlewares/require_first_factor.go index 9f9aa1259..4b9869000 100644 --- a/internal/middlewares/require_first_factor.go +++ b/internal/middlewares/require_first_factor.go @@ -1,7 +1,7 @@ package middlewares import ( - "github.com/authelia/authelia/internal/authentication" + "github.com/authelia/authelia/v4/internal/authentication" ) // RequireFirstFactor check if user has enough permissions to execute the next handler. diff --git a/internal/middlewares/types.go b/internal/middlewares/types.go index 064a02187..f1e8467cf 100644 --- a/internal/middlewares/types.go +++ b/internal/middlewares/types.go @@ -5,15 +5,15 @@ import ( "github.com/sirupsen/logrus" "github.com/valyala/fasthttp" - "github.com/authelia/authelia/internal/authentication" - "github.com/authelia/authelia/internal/authorization" - "github.com/authelia/authelia/internal/configuration/schema" - "github.com/authelia/authelia/internal/notification" - "github.com/authelia/authelia/internal/oidc" - "github.com/authelia/authelia/internal/regulation" - "github.com/authelia/authelia/internal/session" - "github.com/authelia/authelia/internal/storage" - "github.com/authelia/authelia/internal/utils" + "github.com/authelia/authelia/v4/internal/authentication" + "github.com/authelia/authelia/v4/internal/authorization" + "github.com/authelia/authelia/v4/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/notification" + "github.com/authelia/authelia/v4/internal/oidc" + "github.com/authelia/authelia/v4/internal/regulation" + "github.com/authelia/authelia/v4/internal/session" + "github.com/authelia/authelia/v4/internal/storage" + "github.com/authelia/authelia/v4/internal/utils" ) // AutheliaCtx contains all server variables related to Authelia. diff --git a/internal/mocks/mock_authelia_ctx.go b/internal/mocks/mock_authelia_ctx.go index 461d69b67..40a4bb80c 100644 --- a/internal/mocks/mock_authelia_ctx.go +++ b/internal/mocks/mock_authelia_ctx.go @@ -13,12 +13,12 @@ import ( "github.com/stretchr/testify/require" "github.com/valyala/fasthttp" - "github.com/authelia/authelia/internal/authorization" - "github.com/authelia/authelia/internal/configuration/schema" - "github.com/authelia/authelia/internal/middlewares" - "github.com/authelia/authelia/internal/regulation" - "github.com/authelia/authelia/internal/session" - "github.com/authelia/authelia/internal/storage" + "github.com/authelia/authelia/v4/internal/authorization" + "github.com/authelia/authelia/v4/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/middlewares" + "github.com/authelia/authelia/v4/internal/regulation" + "github.com/authelia/authelia/v4/internal/session" + "github.com/authelia/authelia/v4/internal/storage" ) // MockAutheliaCtx a mock of AutheliaCtx. diff --git a/internal/mocks/mock_duo_api.go b/internal/mocks/mock_duo_api.go index 31987efac..40047a4f0 100644 --- a/internal/mocks/mock_duo_api.go +++ b/internal/mocks/mock_duo_api.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/authelia/authelia/internal/duo (interfaces: API) +// Source: github.com/authelia/authelia/v4/internal/duo (interfaces: API) // Package mocks is a generated GoMock package. package mocks @@ -10,8 +10,8 @@ import ( gomock "github.com/golang/mock/gomock" - duo "github.com/authelia/authelia/internal/duo" - "github.com/authelia/authelia/internal/middlewares" + duo "github.com/authelia/authelia/v4/internal/duo" + "github.com/authelia/authelia/v4/internal/middlewares" ) // MockAPI is a mock of API interface. diff --git a/internal/mocks/mock_notifier.go b/internal/mocks/mock_notifier.go index c234579cc..77ecbf00a 100644 --- a/internal/mocks/mock_notifier.go +++ b/internal/mocks/mock_notifier.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/authelia/authelia/internal/notification (interfaces: Notifier) +// Source: github.com/authelia/authelia/v4/internal/notification (interfaces: Notifier) // Package mock_notification is a generated GoMock package. package mocks diff --git a/internal/mocks/mock_user_provider.go b/internal/mocks/mock_user_provider.go index 9d96c46b3..5d65d4fd3 100644 --- a/internal/mocks/mock_user_provider.go +++ b/internal/mocks/mock_user_provider.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/authelia/authelia/internal/authentication (interfaces: UserProvider) +// Source: github.com/authelia/authelia/v4/internal/authentication (interfaces: UserProvider) // Package mocks is a generated GoMock package. package mocks @@ -9,7 +9,7 @@ import ( "github.com/golang/mock/gomock" - "github.com/authelia/authelia/internal/authentication" + "github.com/authelia/authelia/v4/internal/authentication" ) // MockUserProvider is a mock of UserProvider interface. diff --git a/internal/notification/file_notifier.go b/internal/notification/file_notifier.go index ddbd2b0c9..4fad8a5d6 100644 --- a/internal/notification/file_notifier.go +++ b/internal/notification/file_notifier.go @@ -7,7 +7,7 @@ import ( "path/filepath" "time" - "github.com/authelia/authelia/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/configuration/schema" ) // FileNotifier a notifier to send emails to SMTP servers. diff --git a/internal/notification/smtp_notifier.go b/internal/notification/smtp_notifier.go index 38a93f3a3..f223a3c1d 100644 --- a/internal/notification/smtp_notifier.go +++ b/internal/notification/smtp_notifier.go @@ -10,9 +10,9 @@ import ( "strings" "time" - "github.com/authelia/authelia/internal/configuration/schema" - "github.com/authelia/authelia/internal/logging" - "github.com/authelia/authelia/internal/utils" + "github.com/authelia/authelia/v4/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/logging" + "github.com/authelia/authelia/v4/internal/utils" ) // SMTPNotifier a notifier to send emails to SMTP servers. diff --git a/internal/notification/smtp_notifier_test.go b/internal/notification/smtp_notifier_test.go index 2e73a67de..f8d366b6d 100644 --- a/internal/notification/smtp_notifier_test.go +++ b/internal/notification/smtp_notifier_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/authelia/authelia/internal/configuration/schema" - "github.com/authelia/authelia/internal/configuration/validator" + "github.com/authelia/authelia/v4/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/configuration/validator" ) func TestShouldConfigureSMTPNotifierWithTLS11AndDefaultHostname(t *testing.T) { diff --git a/internal/oidc/client.go b/internal/oidc/client.go index f4e984bd3..656e6524b 100644 --- a/internal/oidc/client.go +++ b/internal/oidc/client.go @@ -3,10 +3,10 @@ package oidc import ( "github.com/ory/fosite" - "github.com/authelia/authelia/internal/authentication" - "github.com/authelia/authelia/internal/authorization" - "github.com/authelia/authelia/internal/configuration/schema" - "github.com/authelia/authelia/internal/session" + "github.com/authelia/authelia/v4/internal/authentication" + "github.com/authelia/authelia/v4/internal/authorization" + "github.com/authelia/authelia/v4/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/session" ) // NewClient creates a new InternalClient. diff --git a/internal/oidc/client_test.go b/internal/oidc/client_test.go index fbc0b4356..c1560919f 100644 --- a/internal/oidc/client_test.go +++ b/internal/oidc/client_test.go @@ -7,10 +7,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/authelia/authelia/internal/authentication" - "github.com/authelia/authelia/internal/authorization" - "github.com/authelia/authelia/internal/configuration/schema" - "github.com/authelia/authelia/internal/session" + "github.com/authelia/authelia/v4/internal/authentication" + "github.com/authelia/authelia/v4/internal/authorization" + "github.com/authelia/authelia/v4/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/session" ) func TestNewClient(t *testing.T) { diff --git a/internal/oidc/keys.go b/internal/oidc/keys.go index 07fb78ebe..8460efbf7 100644 --- a/internal/oidc/keys.go +++ b/internal/oidc/keys.go @@ -11,8 +11,8 @@ import ( "github.com/ory/fosite/token/jwt" "gopkg.in/square/go-jose.v2" - "github.com/authelia/authelia/internal/configuration/schema" - "github.com/authelia/authelia/internal/utils" + "github.com/authelia/authelia/v4/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/utils" ) // NewKeyManagerWithConfiguration when provided a schema.OpenIDConnectConfiguration creates a new KeyManager and adds an diff --git a/internal/oidc/provider.go b/internal/oidc/provider.go index bde0fc87c..69b076a8f 100644 --- a/internal/oidc/provider.go +++ b/internal/oidc/provider.go @@ -6,8 +6,8 @@ import ( "github.com/ory/fosite/compose" "github.com/ory/herodot" - "github.com/authelia/authelia/internal/configuration/schema" - "github.com/authelia/authelia/internal/utils" + "github.com/authelia/authelia/v4/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/utils" ) // NewOpenIDConnectProvider new-ups a OpenIDConnectProvider. diff --git a/internal/oidc/provider_test.go b/internal/oidc/provider_test.go index 32dcca33b..4a8cc71de 100644 --- a/internal/oidc/provider_test.go +++ b/internal/oidc/provider_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/authelia/authelia/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/configuration/schema" ) var exampleIssuerPrivateKey = "-----BEGIN RSA PRIVATE KEY-----\nMIIEpAIBAAKCAQEAvcMVMB2vEbqI6PlSNJ4HmUyMxBDJ5iY7FS+zDDAHOZBg9S3S\nKcAn1CZcnyL0VvJ7wcdhR6oTnOwR94eKvzUyJZ+GL2hTMm27dubEYsNdhoCl6N3X\nyEEohNfoxiiCYraVauX8X3M9jFzbEz9+pacaDbHB2syaJ1qFmMNR+HSu2jPzOo7M\nlqKIOgUzA0741MaYNt47AEVg4XU5ORLdolbAkItmYg1QbyFndg9H5IvwKkYaXTGE\nlgDBcPUC0yVjAC15Mguquq+jZeQay+6PSbHTD8PQMOkLjyChI2xEhVNbdCXe676R\ncMW2R/gjrcK23zmtmTWRfdC1iZLSlHO+bJj9vQIDAQABAoIBAEZvkP/JJOCJwqPn\nV3IcbmmilmV4bdi1vByDFgyiDyx4wOSA24+PubjvfFW9XcCgRPuKjDtTj/AhWBHv\nB7stfa2lZuNV7/u562mZArA+IAr62Zp0LdIxDV8x3T8gbjVB3HhPYbv0RJZDKTYd\nzV6jhfIrVu9mHpoY6ZnodhapCPYIyk/d49KBIHZuAc25CUjMXgTeaVtf0c996036\nUxW6ef33wAOJAvW0RCvbXAJfmBeEq2qQlkjTIlpYx71fhZWexHifi8Ouv3Zonc+1\n/P2Adq5uzYVBT92f9RKHg9QxxNzVrLjSMaxyvUtWQCAQfW0tFIRdqBGsHYsQrFtI\nF4yzv8ECgYEA7ntpyN9HD9Z9lYQzPCR73sFCLM+ID99aVij0wHuxK97bkSyyvkLd\n7MyTaym3lg1UEqWNWBCLvFULZx7F0Ah6qCzD4ymm3Bj/ADpWWPgljBI0AFml+HHs\nhcATmXUrj5QbLyhiP2gmJjajp1o/rgATx6ED66seSynD6JOH8wUhhZUCgYEAy7OA\n06PF8GfseNsTqlDjNF0K7lOqd21S0prdwrsJLiVzUlfMM25MLE0XLDUutCnRheeh\nIlcuDoBsVTxz6rkvFGD74N+pgXlN4CicsBq5ofK060PbqCQhSII3fmHobrZ9Cr75\nHmBjAxHx998SKaAAGbBbcYGUAp521i1pH5CEPYkCgYEAkUd1Zf0+2RMdZhwm6hh/\nrW+l1I6IoMK70YkZsLipccRNld7Y9LbfYwYtODcts6di9AkOVfueZJiaXbONZfIE\nZrb+jkAteh9wGL9xIrnohbABJcV3Kiaco84jInUSmGDtPokncOENfHIEuEpuSJ2b\nbx1TuhmAVuGWivR0+ULC7RECgYEAgS0cDRpWc9Xzh9Cl7+PLsXEvdWNpPsL9OsEq\n0Ep7z9+/+f/jZtoTRCS/BTHUpDvAuwHglT5j3p5iFMt5VuiIiovWLwynGYwrbnNS\nqfrIrYKUaH1n1oDS+oBZYLQGCe9/7EifAjxtjYzbvSyg//SPG7tSwfBCREbpZXj2\nqSWkNsECgYA/mCDzCTlrrWPuiepo6kTmN+4TnFA+hJI6NccDVQ+jvbqEdoJ4SW4L\nzqfZSZRFJMNpSgIqkQNRPJqMP0jQ5KRtJrjMWBnYxktwKz9fDg2R2MxdFgMF2LH2\nHEMMhFHlv8NDjVOXh1KwRoltNGVWYsSrD9wKU9GhRCEfmNCGrvBcEg==\n-----END RSA PRIVATE KEY-----" diff --git a/internal/oidc/store.go b/internal/oidc/store.go index d585fe422..4ab335183 100644 --- a/internal/oidc/store.go +++ b/internal/oidc/store.go @@ -8,9 +8,9 @@ import ( "github.com/ory/fosite/storage" "gopkg.in/square/go-jose.v2" - "github.com/authelia/authelia/internal/authorization" - "github.com/authelia/authelia/internal/configuration/schema" - "github.com/authelia/authelia/internal/logging" + "github.com/authelia/authelia/v4/internal/authorization" + "github.com/authelia/authelia/v4/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/logging" ) // NewOpenIDConnectStore returns a new OpenIDConnectStore using the provided schema.OpenIDConnectConfiguration. diff --git a/internal/oidc/store_test.go b/internal/oidc/store_test.go index c29de08c2..d1bad7d4e 100644 --- a/internal/oidc/store_test.go +++ b/internal/oidc/store_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/authelia/authelia/internal/authorization" - "github.com/authelia/authelia/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/authorization" + "github.com/authelia/authelia/v4/internal/configuration/schema" ) func TestOpenIDConnectStore_GetClientPolicy(t *testing.T) { diff --git a/internal/oidc/types.go b/internal/oidc/types.go index b503dc81d..a74ba48ac 100644 --- a/internal/oidc/types.go +++ b/internal/oidc/types.go @@ -9,7 +9,7 @@ import ( "github.com/ory/herodot" "gopkg.in/square/go-jose.v2" - "github.com/authelia/authelia/internal/authorization" + "github.com/authelia/authelia/v4/internal/authorization" ) // OpenIDConnectProvider for OpenID Connect. diff --git a/internal/regulation/regulator.go b/internal/regulation/regulator.go index 2056ef33c..66a40dbce 100644 --- a/internal/regulation/regulator.go +++ b/internal/regulation/regulator.go @@ -4,10 +4,10 @@ import ( "fmt" "time" - "github.com/authelia/authelia/internal/configuration/schema" - "github.com/authelia/authelia/internal/models" - "github.com/authelia/authelia/internal/storage" - "github.com/authelia/authelia/internal/utils" + "github.com/authelia/authelia/v4/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/models" + "github.com/authelia/authelia/v4/internal/storage" + "github.com/authelia/authelia/v4/internal/utils" ) // NewRegulator create a regulator instance. diff --git a/internal/regulation/regulator_test.go b/internal/regulation/regulator_test.go index bf92e605e..8bb4cc848 100644 --- a/internal/regulation/regulator_test.go +++ b/internal/regulation/regulator_test.go @@ -8,11 +8,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" - "github.com/authelia/authelia/internal/configuration/schema" - "github.com/authelia/authelia/internal/mocks" - "github.com/authelia/authelia/internal/models" - "github.com/authelia/authelia/internal/regulation" - "github.com/authelia/authelia/internal/storage" + "github.com/authelia/authelia/v4/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/mocks" + "github.com/authelia/authelia/v4/internal/models" + "github.com/authelia/authelia/v4/internal/regulation" + "github.com/authelia/authelia/v4/internal/storage" ) type RegulatorSuite struct { diff --git a/internal/regulation/types.go b/internal/regulation/types.go index 9b0270b38..3877c6ea0 100644 --- a/internal/regulation/types.go +++ b/internal/regulation/types.go @@ -3,8 +3,8 @@ package regulation import ( "time" - "github.com/authelia/authelia/internal/storage" - "github.com/authelia/authelia/internal/utils" + "github.com/authelia/authelia/v4/internal/storage" + "github.com/authelia/authelia/v4/internal/utils" ) // Regulator an authentication regulator preventing attackers to brute force the service. diff --git a/internal/server/error_handler.go b/internal/server/error_handler.go index e5b595e23..36b93e5b2 100644 --- a/internal/server/error_handler.go +++ b/internal/server/error_handler.go @@ -5,7 +5,7 @@ import ( "github.com/valyala/fasthttp" - "github.com/authelia/authelia/internal/logging" + "github.com/authelia/authelia/v4/internal/logging" ) // Replacement for the default error handler in fasthttp. diff --git a/internal/server/options_handler.go b/internal/server/options_handler.go index 3bc04d5b8..7ebd15d3c 100644 --- a/internal/server/options_handler.go +++ b/internal/server/options_handler.go @@ -3,7 +3,7 @@ package server import ( "github.com/valyala/fasthttp" - "github.com/authelia/authelia/internal/middlewares" + "github.com/authelia/authelia/v4/internal/middlewares" ) func handleOPTIONS(ctx *middlewares.AutheliaCtx) { diff --git a/internal/server/server.go b/internal/server/server.go index d40905791..25f6e8693 100644 --- a/internal/server/server.go +++ b/internal/server/server.go @@ -18,11 +18,11 @@ import ( "github.com/valyala/fasthttp/fasthttpadaptor" "github.com/valyala/fasthttp/pprofhandler" - "github.com/authelia/authelia/internal/configuration/schema" - "github.com/authelia/authelia/internal/duo" - "github.com/authelia/authelia/internal/handlers" - "github.com/authelia/authelia/internal/logging" - "github.com/authelia/authelia/internal/middlewares" + "github.com/authelia/authelia/v4/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/duo" + "github.com/authelia/authelia/v4/internal/handlers" + "github.com/authelia/authelia/v4/internal/logging" + "github.com/authelia/authelia/v4/internal/middlewares" ) //go:embed public_html diff --git a/internal/server/template.go b/internal/server/template.go index b94f4fcc7..2c87c60fe 100644 --- a/internal/server/template.go +++ b/internal/server/template.go @@ -9,8 +9,8 @@ import ( "github.com/valyala/fasthttp" - "github.com/authelia/authelia/internal/logging" - "github.com/authelia/authelia/internal/utils" + "github.com/authelia/authelia/v4/internal/logging" + "github.com/authelia/authelia/v4/internal/utils" ) var alphaNumericRunes = []rune("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789") diff --git a/internal/session/encrypting_serializer.go b/internal/session/encrypting_serializer.go index 615060413..05aef0759 100644 --- a/internal/session/encrypting_serializer.go +++ b/internal/session/encrypting_serializer.go @@ -6,7 +6,7 @@ import ( "github.com/fasthttp/session/v2" - "github.com/authelia/authelia/internal/utils" + "github.com/authelia/authelia/v4/internal/utils" ) // EncryptingSerializer a serializer encrypting the data with AES-GCM with 256-bit keys. diff --git a/internal/session/provider.go b/internal/session/provider.go index df9036fb9..50e5c5161 100644 --- a/internal/session/provider.go +++ b/internal/session/provider.go @@ -10,9 +10,9 @@ import ( "github.com/fasthttp/session/v2/providers/redis" "github.com/valyala/fasthttp" - "github.com/authelia/authelia/internal/configuration/schema" - "github.com/authelia/authelia/internal/logging" - "github.com/authelia/authelia/internal/utils" + "github.com/authelia/authelia/v4/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/logging" + "github.com/authelia/authelia/v4/internal/utils" ) // Provider a session provider. diff --git a/internal/session/provider_config.go b/internal/session/provider_config.go index 2c5574b4e..e7ea52283 100644 --- a/internal/session/provider_config.go +++ b/internal/session/provider_config.go @@ -10,8 +10,8 @@ import ( "github.com/fasthttp/session/v2/providers/redis" "github.com/valyala/fasthttp" - "github.com/authelia/authelia/internal/configuration/schema" - "github.com/authelia/authelia/internal/utils" + "github.com/authelia/authelia/v4/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/utils" ) // NewProviderConfig creates a configuration for creating the session provider. diff --git a/internal/session/provider_config_test.go b/internal/session/provider_config_test.go index 40a3438fb..045c10c6c 100644 --- a/internal/session/provider_config_test.go +++ b/internal/session/provider_config_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/require" "github.com/valyala/fasthttp" - "github.com/authelia/authelia/internal/configuration/schema" - "github.com/authelia/authelia/internal/utils" + "github.com/authelia/authelia/v4/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/utils" ) func TestShouldCreateInMemorySessionProvider(t *testing.T) { diff --git a/internal/session/provider_test.go b/internal/session/provider_test.go index 572a86b95..e113636e4 100644 --- a/internal/session/provider_test.go +++ b/internal/session/provider_test.go @@ -8,9 +8,9 @@ import ( "github.com/stretchr/testify/require" "github.com/valyala/fasthttp" - "github.com/authelia/authelia/internal/authentication" - "github.com/authelia/authelia/internal/authorization" - "github.com/authelia/authelia/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/authentication" + "github.com/authelia/authelia/v4/internal/authorization" + "github.com/authelia/authelia/v4/internal/configuration/schema" ) func TestShouldInitializerSession(t *testing.T) { diff --git a/internal/session/types.go b/internal/session/types.go index 812f97b7e..877975136 100644 --- a/internal/session/types.go +++ b/internal/session/types.go @@ -7,8 +7,8 @@ import ( "github.com/fasthttp/session/v2/providers/redis" "github.com/tstranex/u2f" - "github.com/authelia/authelia/internal/authentication" - "github.com/authelia/authelia/internal/authorization" + "github.com/authelia/authelia/v4/internal/authentication" + "github.com/authelia/authelia/v4/internal/authorization" ) // ProviderConfig is the configuration used to create the session provider. diff --git a/internal/session/user_session.go b/internal/session/user_session.go index 71781aece..96fe27888 100644 --- a/internal/session/user_session.go +++ b/internal/session/user_session.go @@ -4,8 +4,8 @@ import ( "errors" "time" - "github.com/authelia/authelia/internal/authentication" - "github.com/authelia/authelia/internal/authorization" + "github.com/authelia/authelia/v4/internal/authentication" + "github.com/authelia/authelia/v4/internal/authorization" ) // NewDefaultUserSession create a default user session. diff --git a/internal/storage/mysql_provider.go b/internal/storage/mysql_provider.go index a34f74333..29e9a778d 100644 --- a/internal/storage/mysql_provider.go +++ b/internal/storage/mysql_provider.go @@ -7,7 +7,7 @@ import ( _ "github.com/go-sql-driver/mysql" // Load the MySQL Driver used in the connection string. - "github.com/authelia/authelia/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/configuration/schema" ) // MySQLProvider is a MySQL provider. diff --git a/internal/storage/postgres_provider.go b/internal/storage/postgres_provider.go index ac59dcd3c..c2783d082 100644 --- a/internal/storage/postgres_provider.go +++ b/internal/storage/postgres_provider.go @@ -8,7 +8,7 @@ import ( _ "github.com/jackc/pgx/v4/stdlib" // Load the PostgreSQL Driver used in the connection string. - "github.com/authelia/authelia/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/configuration/schema" ) // PostgreSQLProvider is a PostgreSQL provider. diff --git a/internal/storage/provider.go b/internal/storage/provider.go index 5579e285d..d1374ec1e 100644 --- a/internal/storage/provider.go +++ b/internal/storage/provider.go @@ -3,7 +3,7 @@ package storage import ( "time" - "github.com/authelia/authelia/internal/models" + "github.com/authelia/authelia/v4/internal/models" ) // Provider is an interface providing storage capabilities for diff --git a/internal/storage/provider_mock.go b/internal/storage/provider_mock.go index 1d0c43b3c..8414e6dbe 100644 --- a/internal/storage/provider_mock.go +++ b/internal/storage/provider_mock.go @@ -10,7 +10,7 @@ import ( gomock "github.com/golang/mock/gomock" - models "github.com/authelia/authelia/internal/models" + models "github.com/authelia/authelia/v4/internal/models" ) // MockProvider is a mock of Provider interface diff --git a/internal/storage/sql_provider.go b/internal/storage/sql_provider.go index 891eec86e..8bd27a7e8 100644 --- a/internal/storage/sql_provider.go +++ b/internal/storage/sql_provider.go @@ -8,9 +8,9 @@ import ( "github.com/sirupsen/logrus" - "github.com/authelia/authelia/internal/logging" - "github.com/authelia/authelia/internal/models" - "github.com/authelia/authelia/internal/utils" + "github.com/authelia/authelia/v4/internal/logging" + "github.com/authelia/authelia/v4/internal/models" + "github.com/authelia/authelia/v4/internal/utils" ) // SQLProvider is a storage provider persisting data in a SQL database. diff --git a/internal/storage/sql_provider_test.go b/internal/storage/sql_provider_test.go index 9a71b7438..bf978571a 100644 --- a/internal/storage/sql_provider_test.go +++ b/internal/storage/sql_provider_test.go @@ -12,8 +12,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/authelia/authelia/internal/authentication" - "github.com/authelia/authelia/internal/models" + "github.com/authelia/authelia/v4/internal/authentication" + "github.com/authelia/authelia/v4/internal/models" ) const currentSchemaMockSchemaVersion = "1" diff --git a/internal/storage/upgrades.go b/internal/storage/upgrades.go index ec93f3e36..b42ece73c 100644 --- a/internal/storage/upgrades.go +++ b/internal/storage/upgrades.go @@ -4,7 +4,7 @@ import ( "fmt" "sort" - "github.com/authelia/authelia/internal/utils" + "github.com/authelia/authelia/v4/internal/utils" ) func (p *SQLProvider) upgradeCreateTableStatements(tx transaction, statements map[string]string, existingTables []string) error { diff --git a/internal/suites/docker.go b/internal/suites/docker.go index cb5349d32..cb52aed6b 100644 --- a/internal/suites/docker.go +++ b/internal/suites/docker.go @@ -8,7 +8,7 @@ import ( log "github.com/sirupsen/logrus" - "github.com/authelia/authelia/internal/utils" + "github.com/authelia/authelia/v4/internal/utils" ) // DockerEnvironment represent a docker environment. diff --git a/internal/suites/environment.go b/internal/suites/environment.go index cde018e97..fe4d0fc15 100644 --- a/internal/suites/environment.go +++ b/internal/suites/environment.go @@ -8,7 +8,7 @@ import ( log "github.com/sirupsen/logrus" - "github.com/authelia/authelia/internal/utils" + "github.com/authelia/authelia/v4/internal/utils" ) //nolint:unparam diff --git a/internal/suites/kubernetes.go b/internal/suites/kubernetes.go index 529eb99f3..bf032b9cb 100644 --- a/internal/suites/kubernetes.go +++ b/internal/suites/kubernetes.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "github.com/authelia/authelia/internal/utils" + "github.com/authelia/authelia/v4/internal/utils" ) var kindImageName = "authelia-kind-proxy" diff --git a/internal/suites/scenario_available_methods_test.go b/internal/suites/scenario_available_methods_test.go index 07f9cb1a1..995aa220b 100644 --- a/internal/suites/scenario_available_methods_test.go +++ b/internal/suites/scenario_available_methods_test.go @@ -7,7 +7,7 @@ import ( "github.com/tebeka/selenium" - "github.com/authelia/authelia/internal/utils" + "github.com/authelia/authelia/v4/internal/utils" ) type AvailableMethodsScenario struct { diff --git a/internal/suites/suite_kubernetes.go b/internal/suites/suite_kubernetes.go index 0092f5ac0..a59d5f081 100644 --- a/internal/suites/suite_kubernetes.go +++ b/internal/suites/suite_kubernetes.go @@ -7,7 +7,7 @@ import ( log "github.com/sirupsen/logrus" - "github.com/authelia/authelia/internal/utils" + "github.com/authelia/authelia/v4/internal/utils" ) var kubernetesSuiteName = "Kubernetes" diff --git a/internal/suites/suite_standalone_test.go b/internal/suites/suite_standalone_test.go index 4c722777b..0049b8c56 100644 --- a/internal/suites/suite_standalone_test.go +++ b/internal/suites/suite_standalone_test.go @@ -13,8 +13,8 @@ import ( "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - "github.com/authelia/authelia/internal/storage" - "github.com/authelia/authelia/internal/utils" + "github.com/authelia/authelia/v4/internal/storage" + "github.com/authelia/authelia/v4/internal/utils" ) type StandaloneWebDriverSuite struct { diff --git a/internal/utils/certificates.go b/internal/utils/certificates.go index 5710c0362..e038d5794 100644 --- a/internal/utils/certificates.go +++ b/internal/utils/certificates.go @@ -8,8 +8,8 @@ import ( "path/filepath" "strings" - "github.com/authelia/authelia/internal/configuration/schema" - "github.com/authelia/authelia/internal/logging" + "github.com/authelia/authelia/v4/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/logging" ) // NewTLSConfig generates a tls.Config from a schema.TLSConfig and a x509.CertPool. diff --git a/internal/utils/certificates_test.go b/internal/utils/certificates_test.go index 63319188f..697f174a5 100644 --- a/internal/utils/certificates_test.go +++ b/internal/utils/certificates_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/authelia/authelia/internal/configuration/schema" + "github.com/authelia/authelia/v4/internal/configuration/schema" ) func TestShouldSetupDefaultTLSMinVersionOnErr(t *testing.T) { |