diff --git a/server/bindata.go b/server/bindata.go index 2ca4c909864581893a97908855c6deb84cec865e..ab7663d8d5be8904d6e389595771e0c276b813ef 100644 --- a/server/bindata.go +++ b/server/bindata.go @@ -74,7 +74,7 @@ func staticCssBootstrapMinCss() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "static/css/bootstrap.min.css", size: 140936, mode: os.FileMode(420), modTime: time.Unix(1550305824, 0)} + info := bindataFileInfo{name: "static/css/bootstrap.min.css", size: 140936, mode: os.FileMode(420), modTime: time.Unix(1576748485, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -82,7 +82,7 @@ func staticCssBootstrapMinCss() (*asset, error) { var _staticCssSigninCss = []byte(`body { padding-top: 15%; padding-bottom: 20%; - background-color: #efefef; + background-color: #eee; } .form-signin { max-width: 330px; @@ -117,9 +117,6 @@ var _staticCssSigninCss = []byte(`body { border-top-left-radius: 0; border-top-right-radius: 0; } -.form-signin input[type="text"] { - margin-bottom: 10px; -} .error { font-weight: bold; color: red; @@ -150,7 +147,7 @@ func staticCssSigninCss() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "static/css/signin.css", size: 1071, mode: os.FileMode(420), modTime: time.Unix(1576745577, 0)} + info := bindataFileInfo{name: "static/css/signin.css", size: 1009, mode: os.FileMode(420), modTime: time.Unix(1576748496, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -173,7 +170,7 @@ func staticJsBootstrap413MinJs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "static/js/bootstrap-4.1.3.min.js", size: 51039, mode: os.FileMode(420), modTime: time.Unix(1550305766, 0)} + info := bindataFileInfo{name: "static/js/bootstrap-4.1.3.min.js", size: 51039, mode: os.FileMode(420), modTime: time.Unix(1576748485, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -192,7 +189,7 @@ func staticJsJquery331MinJs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "static/js/jquery-3.3.1.min.js", size: 86927, mode: os.FileMode(420), modTime: time.Unix(1516469204, 0)} + info := bindataFileInfo{name: "static/js/jquery-3.3.1.min.js", size: 86927, mode: os.FileMode(420), modTime: time.Unix(1576748485, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -246,7 +243,7 @@ func staticJsLogoutJs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "static/js/logout.js", size: 1005, mode: os.FileMode(420), modTime: time.Unix(1535013418, 0)} + info := bindataFileInfo{name: "static/js/logout.js", size: 1005, mode: os.FileMode(420), modTime: time.Unix(1576748485, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -268,7 +265,7 @@ func staticJsPopper1143MinJs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "static/js/popper-1.14.3.min.js", size: 20337, mode: os.FileMode(420), modTime: time.Unix(1526549114, 0)} + info := bindataFileInfo{name: "static/js/popper-1.14.3.min.js", size: 20337, mode: os.FileMode(420), modTime: time.Unix(1576748485, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1033,7 +1030,7 @@ func staticJsU2fApiJs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "static/js/u2f-api.js", size: 20880, mode: os.FileMode(420), modTime: time.Unix(1535013418, 0)} + info := bindataFileInfo{name: "static/js/u2f-api.js", size: 20880, mode: os.FileMode(420), modTime: time.Unix(1576748485, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1102,14 +1099,14 @@ func staticJsU2fJs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "static/js/u2f.js", size: 1274, mode: os.FileMode(420), modTime: time.Unix(1541228751, 0)} + info := bindataFileInfo{name: "static/js/u2f.js", size: 1274, mode: os.FileMode(420), modTime: time.Unix(1576748485, 0)} a := &asset{bytes: bytes, info: info} return a, nil } var _templatesLogin_otpHtml = []byte(`{{template "header" .}} - <form class="form-signin" action="{{.URLPrefix}}/login/otp" method="post"> + <form class="form-signin" action="{{.URLPrefix}}/login" method="post"> {{.CSRFField}} <div class="row no-gutters"> @@ -1157,7 +1154,7 @@ func templatesLogin_otpHtml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "templates/login_otp.html", size: 973, mode: os.FileMode(420), modTime: time.Unix(1576746408, 0)} + info := bindataFileInfo{name: "templates/login_otp.html", size: 969, mode: os.FileMode(420), modTime: time.Unix(1576748496, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1228,14 +1225,14 @@ func templatesLogin_passwordHtml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "templates/login_password.html", size: 1445, mode: os.FileMode(420), modTime: time.Unix(1576746425, 0)} + info := bindataFileInfo{name: "templates/login_password.html", size: 1445, mode: os.FileMode(420), modTime: time.Unix(1576748485, 0)} a := &asset{bytes: bytes, info: info} return a, nil } var _templatesLogin_u2fHtml = []byte(`{{template "header" .}} - <form class="form-signin" id="u2fForm" action="{{.URLPrefix}}/login/u2f" method="post"> + <form class="form-signin" id="u2fForm" action="{{.URLPrefix}}/login" method="post"> {{.CSRFField}} <input type="hidden" id="u2fResponseField" name="u2f_response" value=""> @@ -1285,7 +1282,7 @@ func templatesLogin_u2fHtml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "templates/login_u2f.html", size: 925, mode: os.FileMode(420), modTime: time.Unix(1576746452, 0)} + info := bindataFileInfo{name: "templates/login_u2f.html", size: 921, mode: os.FileMode(420), modTime: time.Unix(1576748496, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1345,7 +1342,7 @@ func templatesLogoutHtml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "templates/logout.html", size: 1063, mode: os.FileMode(420), modTime: time.Unix(1548600535, 0)} + info := bindataFileInfo{name: "templates/logout.html", size: 1063, mode: os.FileMode(420), modTime: time.Unix(1576748485, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1356,8 +1353,8 @@ var _templatesPageHtml = []byte(`{{define "header"}}<!DOCTYPE html> <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> {{if .U2FSignRequest}}<meta name="u2f_request" value="{{json .U2FSignRequest}}">{{end}} - <link rel="stylesheet" href="{{.URLPrefix}}/static/css/bootstrap.min.css"{{SRI "/static/css/bootstrap.min.css"}}> - <link rel="stylesheet" href="{{.URLPrefix}}/static/css/signin.css"{{SRI "/static/css/signin.css"}}> + <link rel="stylesheet" href="{{.URLPrefix}}/static/css/bootstrap.min.css" integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO"> + <link rel="stylesheet" href="{{.URLPrefix}}/static/css/signin.css" integrity="sha384-9Y3UkAyM3svAuamEoaXIxe+1MqBKJdZtL8S1FZjvE1XqkICDH7DTXNavnFV8Uk2o"> {{if .SiteFavicon}}<link rel="icon" type="image/x-icon" href="{{.URLPrefix}}/favicon.ico">{{end}} <title>{{if .SiteName}}{{.SiteName}} - {{end}}Sign In</title> </head> @@ -1369,15 +1366,15 @@ var _templatesPageHtml = []byte(`{{define "header"}}<!DOCTYPE html> {{define "footer"}} </div> - <script src="{{.URLPrefix}}/static/js/jquery-3.3.1.min.js"{{SRI "/static/js/jquery-3.3.1.min.js"}}></script> - <script src="{{.URLPrefix}}/static/js/popper-1.14.3.min.js"{{SRI "/static/js/popper-1.14.3.min.js"}}></script> - <script src="{{.URLPrefix}}/static/js/bootstrap-4.1.3.min.js"{{SRI "/static/js/bootstrap-4.1.3.min.js"}}></script> + <script src="{{.URLPrefix}}/static/js/jquery-3.3.1.min.js" integrity="sha384-tsQFqpEReu7ZLhBV2VZlAu7zcOV+rXbYlF2cqB8txI/8aZajjp4Bqd+V6D5IgvKT"></script> + <script src="{{.URLPrefix}}/static/js/popper-1.14.3.min.js" integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49"></script> + <script src="{{.URLPrefix}}/static/js/bootstrap-4.1.3.min.js" integrity="sha384-ChfqqxuZUCnJSK3+MXmPNIyE6ZbWh2IMqE241rYiqJxyMiZ6OW/JmZQ5stwEULTy"></script> {{if .U2FSignRequest}} - <script src="{{.URLPrefix}}/static/js/u2f-api.js"{{SRI "/static/js/u2f-api.js"}}></script> - <script src="{{.URLPrefix}}/static/js/u2f.js"{{SRI "/static/js/u2f.js"}}></script> + <script src="{{.URLPrefix}}/static/js/u2f-api.js" integrity="sha384-9ChevE6pp8ArGK03HgolnFjZbF3webZQtYkwcabzbcI28Lx1/2x2j2fbaAWD4cgR"></script> + <script src="{{.URLPrefix}}/static/js/u2f.js" integrity="sha384-7zZy25ajTABErGlCQgcyRDpQDS9QVZv9o+95IfvCjWftQe20f411F1a39Ge5xmCe"></script> {{end}} {{if .IncludeLogoutScripts}} - <script src="{{.URLPrefix}}/static/js/logout.js"{{SRI "/static/js/logout.js"}}></script> + <script src="{{.URLPrefix}}/static/js/logout.js" integrity="sha384-lChVngGLNFXetIJTSxc+scDpi1vsBL+7Xa4r2uZpQFP/6Y2z9eCDXe/Y4IUdklRD"></script> {{end}} </body> </html> @@ -1394,7 +1391,7 @@ func templatesPageHtml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "templates/page.html", size: 1476, mode: os.FileMode(420), modTime: time.Unix(1576745577, 0)} + info := bindataFileInfo{name: "templates/page.html", size: 1865, mode: os.FileMode(420), modTime: time.Unix(1576748496, 0)} a := &asset{bytes: bytes, info: info} return a, nil }