Move source code into internal directory to follow standard project layout.

https://github.com/golang-standards/project-layout

cmd/authelia-scripts/cmd_bootstrap.go

@@ -8,7 +8,7 @@ import (
 	"os/exec"
 	"strings"
 
-	"github.com/clems4ever/authelia/utils"
+	"github.com/clems4ever/authelia/internal/utils"
 	"github.com/spf13/cobra"
 )
 
@@ -19,6 +19,8 @@ type HostEntry struct {
 }
 
 var hostEntries = []HostEntry{
+	// For authelia backend
+	HostEntry{Domain: "authelia.example.com", IP: "192.168.240.50"},
 	// For common tests
 	HostEntry{Domain: "login.example.com", IP: "192.168.240.100"},
 	HostEntry{Domain: "admin.example.com", IP: "192.168.240.100"},

cmd/authelia-scripts/cmd_build.go

@@ -3,7 +3,7 @@ package main
 import (
 	"os"
 
-	"github.com/clems4ever/authelia/utils"
+	"github.com/clems4ever/authelia/internal/utils"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )

cmd/authelia-scripts/cmd_ci.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/clems4ever/authelia/utils"
+	"github.com/clems4ever/authelia/internal/utils"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )

cmd/authelia-scripts/cmd_docker.go

@@ -6,7 +6,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/clems4ever/authelia/utils"
+	"github.com/clems4ever/authelia/internal/utils"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )

cmd/authelia-scripts/cmd_hash_password.go

@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/clems4ever/authelia/authentication"
+	"github.com/clems4ever/authelia/internal/authentication"
 	"github.com/spf13/cobra"
 )
 

cmd/authelia-scripts/cmd_serve.go

@@ -3,7 +3,7 @@ package main
 import (
 	"os"
 
-	"github.com/clems4ever/authelia/utils"
+	"github.com/clems4ever/authelia/internal/utils"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )

cmd/authelia-scripts/cmd_suites.go

@@ -11,8 +11,8 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/clems4ever/authelia/suites"
+	"github.com/clems4ever/authelia/internal/suites"
-	"github.com/clems4ever/authelia/utils"
+	"github.com/clems4ever/authelia/internal/utils"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
@@ -137,6 +137,8 @@ func runSuiteSetupTeardown(command string, suite string) error {
 	s := suites.GlobalRegistry.Get(selectedSuite)
 
 	cmd := utils.CommandWithStdout("go", "run", "cmd/authelia-suites/main.go", command, selectedSuite)
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
 	cmd.Env = os.Environ()
 	return utils.RunCommandWithTimeout(cmd, s.SetUpTimeout)
 }
@@ -154,7 +156,10 @@ func setupSuite(suiteName string) error {
 	}()
 
 	if errSetup := runSuiteSetupTeardown("setup", suiteName); errSetup != nil || interrupted {
-		teardownSuite(suiteName)
+		err := teardownSuite(suiteName)
+		if err != nil {
+			log.Error(err)
+		}
 		return errSetup
 	}
 
@@ -226,12 +231,14 @@ func runSuiteTests(suiteName string, withEnv bool) error {
 	if suite.TestTimeout > 0 {
 		timeout = fmt.Sprintf("%ds", int64(suite.TestTimeout/time.Second))
 	}
-	testCmdLine := fmt.Sprintf("go test ./suites -timeout %s -run '^(Test%sSuite)$'", timeout, suiteName)
+	testCmdLine := fmt.Sprintf("go test ./internal/suites -timeout %s -run '^(Test%sSuite)$'", timeout, suiteName)
 
 	log.Infof("Running tests of suite %s...", suiteName)
 	log.Debugf("Running tests with command: %s", testCmdLine)
 
 	cmd := utils.CommandWithStdout("bash", "-c", testCmdLine)
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
 	cmd.Env = os.Environ()
 	if headless {
 		cmd.Env = append(cmd.Env, "HEADLESS=y")
@@ -240,7 +247,11 @@ func runSuiteTests(suiteName string, withEnv bool) error {
 	testErr := cmd.Run()
 
 	if withEnv {
-		teardownSuite(suiteName)
+		err := teardownSuite(suiteName)
+
+		if err != nil {
+			log.Error(err)
+		}
 	}
 
 	return testErr

cmd/authelia-scripts/cmd_unittest.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/clems4ever/authelia/utils"
+	"github.com/clems4ever/authelia/internal/utils"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )

cmd/authelia-scripts/docker.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/clems4ever/authelia/utils"
+	"github.com/clems4ever/authelia/internal/utils"
 )
 
 // Docker a docker object

cmd/authelia-scripts/main.go

@@ -3,7 +3,7 @@
 package main
 
 import (
-	"github.com/clems4ever/authelia/utils"
+	"github.com/clems4ever/authelia/internal/utils"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )

cmd/authelia-scripts/migration.go

@@ -4,8 +4,8 @@ import (
 	"encoding/base64"
 	"strings"
 
-	"github.com/clems4ever/authelia/configuration"
+	"github.com/clems4ever/authelia/internal/configuration"
-	"github.com/clems4ever/authelia/storage"
+	"github.com/clems4ever/authelia/internal/storage"
 )
 
 // TOTPSecretsV3 one entry of TOTP secrets in v3

cmd/authelia-scripts/migration_local.go

@@ -8,8 +8,8 @@ import (
 	"path"
 	"time"
 
-	"github.com/clems4ever/authelia/models"
+	"github.com/clems4ever/authelia/internal/models"
-	"github.com/clems4ever/authelia/storage"
+	"github.com/clems4ever/authelia/internal/storage"
 	"github.com/spf13/cobra"
 )
 

cmd/authelia-scripts/migration_mongo.go

@@ -5,8 +5,8 @@ import (
 	"log"
 	"time"
 
-	"github.com/clems4ever/authelia/models"
+	"github.com/clems4ever/authelia/internal/models"
-	"github.com/clems4ever/authelia/storage"
+	"github.com/clems4ever/authelia/internal/storage"
 	"github.com/spf13/cobra"
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/mongo"

cmd/authelia-suites/main.go

@@ -5,8 +5,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/clems4ever/authelia/suites"
+	"github.com/clems4ever/authelia/internal/suites"
-	"github.com/clems4ever/authelia/utils"
+	"github.com/clems4ever/authelia/internal/utils"
 	"github.com/otiai10/copy"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
@@ -18,7 +18,7 @@ var tmpDirectory = "/tmp/authelia/suites/"
 var runningSuiteFile = ".suite"
 
 func init() {
-	log.SetLevel(log.DebugLevel)
+	log.SetLevel(log.InfoLevel)
 }
 
 func main() {
@@ -61,7 +61,7 @@ func setupSuite(cmd *cobra.Command, args []string) {
 		log.Fatal(err)
 	}
 
-	suiteResourcePath := cwd + "/suites/" + suiteName
+	suiteResourcePath := cwd + "/internal/suites/" + suiteName
 
 	exist, err := utils.FileExists(suiteResourcePath)
 

cmd/authelia/main.go

@@ -6,16 +6,16 @@ import (
 	"log"
 	"os"
 
-	"github.com/clems4ever/authelia/authentication"
+	"github.com/clems4ever/authelia/internal/authentication"
-	"github.com/clems4ever/authelia/authorization"
+	"github.com/clems4ever/authelia/internal/authorization"
-	"github.com/clems4ever/authelia/configuration"
+	"github.com/clems4ever/authelia/internal/configuration"
-	"github.com/clems4ever/authelia/logging"
+	"github.com/clems4ever/authelia/internal/logging"
-	"github.com/clems4ever/authelia/middlewares"
+	"github.com/clems4ever/authelia/internal/middlewares"
-	"github.com/clems4ever/authelia/notification"
+	"github.com/clems4ever/authelia/internal/notification"
-	"github.com/clems4ever/authelia/regulation"
+	"github.com/clems4ever/authelia/internal/regulation"
-	"github.com/clems4ever/authelia/server"
+	"github.com/clems4ever/authelia/internal/server"
-	"github.com/clems4ever/authelia/session"
+	"github.com/clems4ever/authelia/internal/session"
-	"github.com/clems4ever/authelia/storage"
+	"github.com/clems4ever/authelia/internal/storage"
 	"github.com/sirupsen/logrus"
 )
 

example/compose/authelia/docker-compose.backend.yml

@@ -15,4 +15,5 @@ services:
       - SUITE_PATH=${SUITE_PATH}
       - ENVIRONMENT=dev
     networks:
-      - authelianet
+      authelianet:
+        ipv4_address: 192.168.240.50

internal/authentication/ldap_user_provider.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/clems4ever/authelia/configuration/schema"
+	"github.com/clems4ever/authelia/internal/configuration/schema"
 	"gopkg.in/ldap.v3"
 )
 

internal/authorization/authorizer.go

@@ -6,7 +6,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/clems4ever/authelia/configuration/schema"
+	"github.com/clems4ever/authelia/internal/configuration/schema"
 )
 
 const userPrefix = "user:"

internal/authorization/authorizer_test.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/stretchr/testify/suite"
 
-	"github.com/clems4ever/authelia/configuration/schema"
+	"github.com/clems4ever/authelia/internal/configuration/schema"
 
 	"github.com/stretchr/testify/assert"
 )

internal/configuration/reader.go

@@ -5,8 +5,8 @@ import (
 
 	"gopkg.in/yaml.v2"
 
-	"github.com/clems4ever/authelia/configuration/schema"
+	"github.com/clems4ever/authelia/internal/configuration/schema"
-	"github.com/clems4ever/authelia/configuration/validator"
+	"github.com/clems4ever/authelia/internal/configuration/validator"
 )
 
 func check(e error) {

internal/configuration/reader_test.go

@@ -7,7 +7,7 @@ import (
 )
 
 func TestShouldParseConfigFile(t *testing.T) {
-	config, errors := Read("../test/resources/config.yml")
+	config, errors := Read("../../test/resources/config.yml")
 
 	assert.Len(t, errors, 0)
 

internal/configuration/schema/validator_test.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/clems4ever/authelia/configuration/schema"
+	"github.com/clems4ever/authelia/internal/configuration/schema"
 )
 
 type TestNestedStruct struct {

internal/configuration/validator/authentication.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 	"strings"
 
-	"github.com/clems4ever/authelia/configuration/schema"
+	"github.com/clems4ever/authelia/internal/configuration/schema"
 )
 
 var ldapProtocolPrefix = "ldap://"

internal/configuration/validator/authentication_test.go

@@ -3,7 +3,7 @@ package validator
 import (
 	"testing"
 
-	"github.com/clems4ever/authelia/configuration/schema"
+	"github.com/clems4ever/authelia/internal/configuration/schema"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/suite"
 )

internal/configuration/validator/configuration.go

@@ -3,7 +3,7 @@ package validator
 import (
 	"fmt"
 
-	"github.com/clems4ever/authelia/configuration/schema"
+	"github.com/clems4ever/authelia/internal/configuration/schema"
 )
 
 var defaultPort = 8080

internal/configuration/validator/configuration_test.go

@@ -3,7 +3,7 @@ package validator
 import (
 	"testing"
 
-	"github.com/clems4ever/authelia/configuration/schema"
+	"github.com/clems4ever/authelia/internal/configuration/schema"
 	"github.com/stretchr/testify/assert"
 )
 

internal/configuration/validator/session.go

@@ -3,7 +3,7 @@ package validator
 import (
 	"errors"
 
-	"github.com/clems4ever/authelia/configuration/schema"
+	"github.com/clems4ever/authelia/internal/configuration/schema"
 )
 
 // ValidateSession validates and update session configuration.

internal/configuration/validator/session_test.go

@@ -3,7 +3,7 @@ package validator
 import (
 	"testing"
 
-	"github.com/clems4ever/authelia/configuration/schema"
+	"github.com/clems4ever/authelia/internal/configuration/schema"
 	"github.com/stretchr/testify/assert"
 )
 

internal/configuration/validator/storage.go

@@ -3,7 +3,7 @@ package validator
 import (
 	"errors"
 
-	"github.com/clems4ever/authelia/configuration/schema"
+	"github.com/clems4ever/authelia/internal/configuration/schema"
 )
 
 // ValidateSQLStorage validates storage configuration.

internal/configuration/validator/totp.go

@@ -1,7 +1,7 @@
 package validator
 
 import (
-	"github.com/clems4ever/authelia/configuration/schema"
+	"github.com/clems4ever/authelia/internal/configuration/schema"
 )
 
 const defaultTOTPIssuer = "Authelia"

internal/handlers/handler_2fa_available_methods.go

@@ -1,8 +1,8 @@
 package handlers
 
 import (
-	"github.com/clems4ever/authelia/authentication"
+	"github.com/clems4ever/authelia/internal/authentication"
-	"github.com/clems4ever/authelia/middlewares"
+	"github.com/clems4ever/authelia/internal/middlewares"
 )
 
 // SecondFactorAvailableMethodsGet retrieve available 2FA methods.

internal/handlers/handler_2fa_available_methods_test.go

@@ -3,9 +3,9 @@ package handlers
 import (
 	"testing"
 
-	"github.com/clems4ever/authelia/mocks"
+	"github.com/clems4ever/authelia/internal/mocks"
 
-	"github.com/clems4ever/authelia/configuration/schema"
+	"github.com/clems4ever/authelia/internal/configuration/schema"
 	"github.com/stretchr/testify/suite"
 )
 

internal/handlers/handler_2fa_preferences.go

@@ -3,8 +3,8 @@ package handlers
 import (
 	"fmt"
 
-	"github.com/clems4ever/authelia/authentication"
+	"github.com/clems4ever/authelia/internal/authentication"
-	"github.com/clems4ever/authelia/middlewares"
+	"github.com/clems4ever/authelia/internal/middlewares"
 )
 
 // SecondFactorPreferencesGet get the user preferences regarding 2FA.

internal/handlers/handler_2fa_preferences_test.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/clems4ever/authelia/mocks"
+	"github.com/clems4ever/authelia/internal/mocks"
 
 	"github.com/golang/mock/gomock"
 	"github.com/sirupsen/logrus"

internal/handlers/handler_firstfactor.go

@@ -5,11 +5,11 @@ import (
 	"net/url"
 	"time"
 
-	"github.com/clems4ever/authelia/authentication"
+	"github.com/clems4ever/authelia/internal/authentication"
-	"github.com/clems4ever/authelia/authorization"
+	"github.com/clems4ever/authelia/internal/authorization"
-	"github.com/clems4ever/authelia/middlewares"
+	"github.com/clems4ever/authelia/internal/middlewares"
-	"github.com/clems4ever/authelia/regulation"
+	"github.com/clems4ever/authelia/internal/regulation"
-	"github.com/clems4ever/authelia/session"
+	"github.com/clems4ever/authelia/internal/session"
 )
 
 // FirstFactorPost is the handler performing the first factory.

internal/handlers/handler_firstfactor_test.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/clems4ever/authelia/mocks"
+	"github.com/clems4ever/authelia/internal/mocks"
 
-	"github.com/clems4ever/authelia/authentication"
+	"github.com/clems4ever/authelia/internal/authentication"
 	"github.com/golang/mock/gomock"
 	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/assert"

internal/handlers/handler_logout.go

@@ -3,7 +3,7 @@ package handlers
 import (
 	"fmt"
 
-	"github.com/clems4ever/authelia/middlewares"
+	"github.com/clems4ever/authelia/internal/middlewares"
 )
 
 // LogoutPost is the handler logging out the user attached to the given cookie.

internal/handlers/handler_logout_test.go

@@ -4,7 +4,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/clems4ever/authelia/mocks"
+	"github.com/clems4ever/authelia/internal/mocks"
 
 	"github.com/stretchr/testify/assert"
 

internal/handlers/handler_register_totp.go

@@ -3,8 +3,8 @@ package handlers
 import (
 	"fmt"
 
-	"github.com/clems4ever/authelia/middlewares"
+	"github.com/clems4ever/authelia/internal/middlewares"
-	"github.com/clems4ever/authelia/session"
+	"github.com/clems4ever/authelia/internal/session"
 	"github.com/pquerna/otp/totp"
 )
 

internal/handlers/handler_register_u2f_step1.go

@@ -3,7 +3,7 @@ package handlers
 import (
 	"fmt"
 
-	"github.com/clems4ever/authelia/middlewares"
+	"github.com/clems4ever/authelia/internal/middlewares"
 	"github.com/tstranex/u2f"
 )
 

internal/handlers/handler_register_u2f_step2.go

@@ -4,7 +4,7 @@ import (
 	"crypto/elliptic"
 	"fmt"
 
-	"github.com/clems4ever/authelia/middlewares"
+	"github.com/clems4ever/authelia/internal/middlewares"
 	"github.com/tstranex/u2f"
 )
 

internal/handlers/handler_reset_password_step1.go

@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/clems4ever/authelia/middlewares"
+	"github.com/clems4ever/authelia/internal/middlewares"
-	"github.com/clems4ever/authelia/session"
+	"github.com/clems4ever/authelia/internal/session"
 )
 
 func identityRetrieverFromStorage(ctx *middlewares.AutheliaCtx) (*session.Identity, error) {

internal/handlers/handler_reset_password_step2.go

@@ -3,7 +3,7 @@ package handlers
 import (
 	"fmt"
 
-	"github.com/clems4ever/authelia/middlewares"
+	"github.com/clems4ever/authelia/internal/middlewares"
 )
 
 // ResetPasswordPost handler for resetting passwords

internal/handlers/handler_sign_duo.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"net/url"
 
-	"github.com/clems4ever/authelia/authentication"
+	"github.com/clems4ever/authelia/internal/authentication"
-	"github.com/clems4ever/authelia/duo"
+	"github.com/clems4ever/authelia/internal/duo"
-	"github.com/clems4ever/authelia/middlewares"
+	"github.com/clems4ever/authelia/internal/middlewares"
 )
 
 // SecondFactorDuoPost handler for sending a push notification via duo api.

internal/handlers/handler_sign_duo_test.go

@@ -5,8 +5,8 @@ import (
 	"net/url"
 	"testing"
 
-	"github.com/clems4ever/authelia/duo"
+	"github.com/clems4ever/authelia/internal/duo"
-	"github.com/clems4ever/authelia/mocks"
+	"github.com/clems4ever/authelia/internal/mocks"
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/suite"

internal/handlers/handler_sign_totp.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"net/url"
 
-	"github.com/clems4ever/authelia/authentication"
+	"github.com/clems4ever/authelia/internal/authentication"
-	"github.com/clems4ever/authelia/middlewares"
+	"github.com/clems4ever/authelia/internal/middlewares"
 	"github.com/pquerna/otp/totp"
 )
 

internal/handlers/handler_sign_u2f_step1.go

@@ -4,9 +4,9 @@ import (
 	"crypto/elliptic"
 	"fmt"
 
-	"github.com/clems4ever/authelia/middlewares"
+	"github.com/clems4ever/authelia/internal/middlewares"
-	"github.com/clems4ever/authelia/session"
+	"github.com/clems4ever/authelia/internal/session"
-	"github.com/clems4ever/authelia/storage"
+	"github.com/clems4ever/authelia/internal/storage"
 	"github.com/tstranex/u2f"
 )
 

internal/handlers/handler_sign_u2f_step2.go

@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"net/url"
 
-	"github.com/clems4ever/authelia/authentication"
+	"github.com/clems4ever/authelia/internal/authentication"
-	"github.com/clems4ever/authelia/middlewares"
+	"github.com/clems4ever/authelia/internal/middlewares"
 	"github.com/tstranex/u2f"
 )
 

internal/handlers/handler_state.go

@@ -1,7 +1,7 @@
 package handlers
 
 import (
-	"github.com/clems4ever/authelia/middlewares"
+	"github.com/clems4ever/authelia/internal/middlewares"
 )
 
 // StateGet is the handler serving the user state.

internal/handlers/handler_state_test.go

@@ -4,9 +4,9 @@ import (
 	"encoding/json"
 	"testing"
 
-	"github.com/clems4ever/authelia/mocks"
+	"github.com/clems4ever/authelia/internal/mocks"
 
-	"github.com/clems4ever/authelia/authentication"
+	"github.com/clems4ever/authelia/internal/authentication"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/suite"
 )

internal/handlers/handler_verify.go

@@ -8,9 +8,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/clems4ever/authelia/authentication"
+	"github.com/clems4ever/authelia/internal/authentication"
-	"github.com/clems4ever/authelia/authorization"
+	"github.com/clems4ever/authelia/internal/authorization"
-	"github.com/clems4ever/authelia/middlewares"
+	"github.com/clems4ever/authelia/internal/middlewares"
 	"github.com/valyala/fasthttp"
 )
 

internal/handlers/handler_verify_test.go

@@ -6,10 +6,10 @@ import (
 	"net/url"
 	"testing"
 
-	"github.com/clems4ever/authelia/authentication"
+	"github.com/clems4ever/authelia/internal/authentication"
-	"github.com/clems4ever/authelia/authorization"
+	"github.com/clems4ever/authelia/internal/authorization"
-	"github.com/clems4ever/authelia/configuration/schema"
+	"github.com/clems4ever/authelia/internal/configuration/schema"
-	"github.com/clems4ever/authelia/mocks"
+	"github.com/clems4ever/authelia/internal/mocks"
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
 )

internal/handlers/types.go

@@ -1,7 +1,7 @@
 package handlers
 
 import (
-	"github.com/clems4ever/authelia/authentication"
+	"github.com/clems4ever/authelia/internal/authentication"
 	"github.com/tstranex/u2f"
 )
 

internal/middlewares/authelia_context.go

@@ -7,10 +7,10 @@ import (
 	"strings"
 
 	"github.com/asaskevich/govalidator"
-	"github.com/clems4ever/authelia/session"
+	"github.com/clems4ever/authelia/internal/session"
 
-	"github.com/clems4ever/authelia/configuration/schema"
+	"github.com/clems4ever/authelia/internal/configuration/schema"
-	"github.com/clems4ever/authelia/logging"
+	"github.com/clems4ever/authelia/internal/logging"
 	"github.com/valyala/fasthttp"
 )
 

internal/middlewares/authelia_context_test.go

@@ -3,11 +3,11 @@ package middlewares_test
 import (
 	"testing"
 
-	"github.com/clems4ever/authelia/session"
+	"github.com/clems4ever/authelia/internal/session"
 
-	"github.com/clems4ever/authelia/configuration/schema"
+	"github.com/clems4ever/authelia/internal/configuration/schema"
-	"github.com/clems4ever/authelia/middlewares"
+	"github.com/clems4ever/authelia/internal/middlewares"
-	"github.com/clems4ever/authelia/mocks"
+	"github.com/clems4ever/authelia/internal/mocks"
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
 	"github.com/valyala/fasthttp"

internal/middlewares/identity_verification.go

@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/clems4ever/authelia/templates"
+	"github.com/clems4ever/authelia/internal/templates"
 	jwt "github.com/dgrijalva/jwt-go"
 )
 

internal/middlewares/identity_verification_test.go

@@ -5,9 +5,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/clems4ever/authelia/middlewares"
+	"github.com/clems4ever/authelia/internal/middlewares"
-	"github.com/clems4ever/authelia/mocks"
+	"github.com/clems4ever/authelia/internal/mocks"
-	"github.com/clems4ever/authelia/session"
+	"github.com/clems4ever/authelia/internal/session"
 	jwt "github.com/dgrijalva/jwt-go"
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"

internal/middlewares/log_request.go

@@ -1,7 +1,7 @@
 package middlewares
 
 import (
-	"github.com/clems4ever/authelia/logging"
+	"github.com/clems4ever/authelia/internal/logging"
 	"github.com/valyala/fasthttp"
 )
 

internal/middlewares/require_first_factor.go

@@ -1,7 +1,7 @@
 package middlewares
 
 import (
-	"github.com/clems4ever/authelia/authentication"
+	"github.com/clems4ever/authelia/internal/authentication"
 )
 
 // RequireFirstFactor check if user has enough permissions to execute the next handler.

internal/middlewares/types.go

@@ -1,13 +1,13 @@
 package middlewares
 
 import (
-	"github.com/clems4ever/authelia/authentication"
+	"github.com/clems4ever/authelia/internal/authentication"
-	"github.com/clems4ever/authelia/authorization"
+	"github.com/clems4ever/authelia/internal/authorization"
-	"github.com/clems4ever/authelia/configuration/schema"
+	"github.com/clems4ever/authelia/internal/configuration/schema"
-	"github.com/clems4ever/authelia/notification"
+	"github.com/clems4ever/authelia/internal/notification"
-	"github.com/clems4ever/authelia/regulation"
+	"github.com/clems4ever/authelia/internal/regulation"
-	"github.com/clems4ever/authelia/session"
+	"github.com/clems4ever/authelia/internal/session"
-	"github.com/clems4ever/authelia/storage"
+	"github.com/clems4ever/authelia/internal/storage"
 	jwt "github.com/dgrijalva/jwt-go"
 	"github.com/sirupsen/logrus"
 	"github.com/valyala/fasthttp"

internal/mocks/mock_authelia_ctx.go

@@ -5,14 +5,14 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/clems4ever/authelia/regulation"
+	"github.com/clems4ever/authelia/internal/regulation"
-	"github.com/clems4ever/authelia/storage"
+	"github.com/clems4ever/authelia/internal/storage"
 	"github.com/stretchr/testify/assert"
 
-	"github.com/clems4ever/authelia/authorization"
+	"github.com/clems4ever/authelia/internal/authorization"
-	"github.com/clems4ever/authelia/configuration/schema"
+	"github.com/clems4ever/authelia/internal/configuration/schema"
-	"github.com/clems4ever/authelia/middlewares"
+	"github.com/clems4ever/authelia/internal/middlewares"
-	"github.com/clems4ever/authelia/session"
+	"github.com/clems4ever/authelia/internal/session"
 	"github.com/golang/mock/gomock"
 	"github.com/sirupsen/logrus"
 	"github.com/sirupsen/logrus/hooks/test"

internal/mocks/mock_duo_api.go

@@ -1,5 +1,5 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/clems4ever/authelia/duo (interfaces: API)
+// Source: github.com/clems4ever/authelia/internal/duo (interfaces: API)
 
 // Package mocks is a generated GoMock package.
 package mocks
@@ -8,7 +8,7 @@ import (
 	url "net/url"
 	reflect "reflect"
 
-	duo "github.com/clems4ever/authelia/duo"
+	duo "github.com/clems4ever/authelia/internal/duo"
 	gomock "github.com/golang/mock/gomock"
 )
 

internal/mocks/mock_notifier.go

@@ -1,5 +1,5 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/clems4ever/authelia/notification (interfaces: Notifier)
+// Source: github.com/clems4ever/authelia/internal/notification (interfaces: Notifier)
 
 // Package mock_notification is a generated GoMock package.
 package mocks

internal/mocks/mock_user_provider.go

@@ -1,5 +1,5 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/clems4ever/authelia/authentication (interfaces: UserProvider)
+// Source: github.com/clems4ever/authelia/internal/authentication (interfaces: UserProvider)
 
 // Package mocks is a generated GoMock package.
 package mocks
@@ -7,7 +7,7 @@ package mocks
 import (
 	reflect "reflect"
 
-	authentication "github.com/clems4ever/authelia/authentication"
+	authentication "github.com/clems4ever/authelia/internal/authentication"
 	gomock "github.com/golang/mock/gomock"
 )
 

internal/notification/file_notifier.go

@@ -5,7 +5,7 @@ import (
 	"io/ioutil"
 	"time"
 
-	"github.com/clems4ever/authelia/configuration/schema"
+	"github.com/clems4ever/authelia/internal/configuration/schema"
 )
 
 // FileNotifier a notifier to send emails to SMTP servers.

internal/notification/smtp_notifier.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"net/smtp"
 
-	"github.com/clems4ever/authelia/configuration/schema"
+	"github.com/clems4ever/authelia/internal/configuration/schema"
 )
 
 // SMTPNotifier a notifier to send emails to SMTP servers.

internal/regulation/regulator.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/clems4ever/authelia/configuration/schema"
+	"github.com/clems4ever/authelia/internal/configuration/schema"
-	"github.com/clems4ever/authelia/models"
+	"github.com/clems4ever/authelia/internal/models"
-	"github.com/clems4ever/authelia/storage"
+	"github.com/clems4ever/authelia/internal/storage"
 )
 
 // NewRegulator create a regulator instance.

internal/regulation/regulator_test.go

@@ -4,10 +4,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/clems4ever/authelia/configuration/schema"
+	"github.com/clems4ever/authelia/internal/configuration/schema"
-	"github.com/clems4ever/authelia/models"
+	"github.com/clems4ever/authelia/internal/models"
-	"github.com/clems4ever/authelia/regulation"
+	"github.com/clems4ever/authelia/internal/regulation"
-	"github.com/clems4ever/authelia/storage"
+	"github.com/clems4ever/authelia/internal/storage"
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/suite"

internal/regulation/types.go

@@ -3,7 +3,7 @@ package regulation
 import (
 	"time"
 
-	"github.com/clems4ever/authelia/storage"
+	"github.com/clems4ever/authelia/internal/storage"
 )
 
 // Regulator an authentication regulator preventing attackers to brute force the service.