mirror of
https://github.com/0rangebananaspy/authelia.git
synced 2024-09-14 22:47:21 +07:00
8aade7f40e
* added regulation validator * made regulations find_time and ban_time values duration notation strings * added DefaultRegulationConfiguration for the validator * made session expiration and inactivity values duration notation strings * TOTP period does not need to be converted because adjustment should be discouraged * moved TOTP defaults to DefaultTOTPConfiguration and removed the consts * arranged the root config validator in configuration file order * adjusted tests for the changes * moved duration notation docs to root of configuration * added references to duration notation where applicable * project wide gofmt and goimports: * run gofmt * run goimports -local github.com/authelia/authelia -w on all files * Make jwt_secret error uniform and add tests * now at 100% coverage for internal/configuration/validator/configuration.go
70 lines
1.6 KiB
Go
70 lines
1.6 KiB
Go
package suites
|
|
|
|
import (
|
|
"fmt"
|
|
"strings"
|
|
"time"
|
|
|
|
log "github.com/sirupsen/logrus"
|
|
|
|
"github.com/authelia/authelia/internal/utils"
|
|
)
|
|
|
|
func waitUntilServiceLogDetected(
|
|
interval time.Duration,
|
|
timeout time.Duration,
|
|
dockerEnvironment *DockerEnvironment,
|
|
service string,
|
|
logPatterns []string) error {
|
|
log.Debug("Waiting for service " + service + " to be ready...")
|
|
err := utils.CheckUntil(5*time.Second, 1*time.Minute, func() (bool, error) {
|
|
logs, err := dockerEnvironment.Logs(service, []string{"--tail", "20"})
|
|
fmt.Printf(".")
|
|
|
|
if err != nil {
|
|
return false, err
|
|
}
|
|
for _, pattern := range logPatterns {
|
|
if strings.Contains(logs, pattern) {
|
|
return true, nil
|
|
}
|
|
}
|
|
return false, nil
|
|
})
|
|
|
|
fmt.Print("\n")
|
|
return err
|
|
}
|
|
|
|
func waitUntilAutheliaBackendIsReady(dockerEnvironment *DockerEnvironment) error {
|
|
return waitUntilServiceLogDetected(
|
|
5*time.Second,
|
|
90*time.Second,
|
|
dockerEnvironment,
|
|
"authelia-backend",
|
|
[]string{"Authelia is listening for"})
|
|
}
|
|
|
|
func waitUntilAutheliaFrontendIsReady(dockerEnvironment *DockerEnvironment) error {
|
|
return waitUntilServiceLogDetected(
|
|
5*time.Second,
|
|
90*time.Second,
|
|
dockerEnvironment,
|
|
"authelia-frontend",
|
|
[]string{"You can now view web in the browser.", "Compiled with warnings", "Compiled successfully!"})
|
|
}
|
|
|
|
func waitUntilAutheliaIsReady(dockerEnvironment *DockerEnvironment) error {
|
|
log.Info("Waiting for Authelia to be ready...")
|
|
|
|
if err := waitUntilAutheliaBackendIsReady(dockerEnvironment); err != nil {
|
|
return err
|
|
}
|
|
|
|
if err := waitUntilAutheliaFrontendIsReady(dockerEnvironment); err != nil {
|
|
return err
|
|
}
|
|
log.Info("Authelia is now ready!")
|
|
return nil
|
|
}
|