Merge pull request #750 from rithujohn191/use-utc

server: use UTC timestamps in dex.
This commit is contained in:
rithu leena john 2016-12-16 16:44:00 -08:00 committed by GitHub
commit 03033e5e44

View File

@ -180,6 +180,9 @@ func serve(cmd *cobra.Command, args []string) error {
logger.Infof("config skipping approval screen") logger.Infof("config skipping approval screen")
} }
// explicitly convert to UTC.
now := func() time.Time { return time.Now().UTC() }
serverConfig := server.Config{ serverConfig := server.Config{
SupportedResponseTypes: c.OAuth2.ResponseTypes, SupportedResponseTypes: c.OAuth2.ResponseTypes,
SkipApprovalScreen: c.OAuth2.SkipApprovalScreen, SkipApprovalScreen: c.OAuth2.SkipApprovalScreen,
@ -189,6 +192,7 @@ func serve(cmd *cobra.Command, args []string) error {
Web: c.Frontend, Web: c.Frontend,
EnablePasswordDB: c.EnablePasswordDB, EnablePasswordDB: c.EnablePasswordDB,
Logger: logger, Logger: logger,
Now: now,
} }
if c.Expiry.SigningKeys != "" { if c.Expiry.SigningKeys != "" {
signingKeys, err := time.ParseDuration(c.Expiry.SigningKeys) signingKeys, err := time.ParseDuration(c.Expiry.SigningKeys)
@ -251,6 +255,15 @@ var (
logFormats = []string{"json", "text"} logFormats = []string{"json", "text"}
) )
type utcFormatter struct {
f logrus.Formatter
}
func (f *utcFormatter) Format(e *logrus.Entry) ([]byte, error) {
e.Time = e.Time.UTC()
return f.f.Format(e)
}
func newLogger(level string, format string) (logrus.FieldLogger, error) { func newLogger(level string, format string) (logrus.FieldLogger, error) {
var logLevel logrus.Level var logLevel logrus.Level
switch strings.ToLower(level) { switch strings.ToLower(level) {
@ -264,19 +277,19 @@ func newLogger(level string, format string) (logrus.FieldLogger, error) {
return nil, fmt.Errorf("log level is not one of the supported values (%s): %s", strings.Join(logLevels, ", "), level) return nil, fmt.Errorf("log level is not one of the supported values (%s): %s", strings.Join(logLevels, ", "), level)
} }
var formatter logrus.Formatter var formatter utcFormatter
switch strings.ToLower(format) { switch strings.ToLower(format) {
case "", "text": case "", "text":
formatter = &logrus.TextFormatter{DisableColors: true} formatter.f = &logrus.TextFormatter{DisableColors: true}
case "json": case "json":
formatter = &logrus.JSONFormatter{} formatter.f = &logrus.JSONFormatter{}
default: default:
return nil, fmt.Errorf("log format is not one of the supported values (%s): %s", strings.Join(logFormats, ", "), format) return nil, fmt.Errorf("log format is not one of the supported values (%s): %s", strings.Join(logFormats, ", "), format)
} }
return &logrus.Logger{ return &logrus.Logger{
Out: os.Stderr, Out: os.Stderr,
Formatter: formatter, Formatter: &formatter,
Level: logLevel, Level: logLevel,
}, nil }, nil
} }