diff --git a/src/frontend/rest/services/authentication.rs b/src/frontend/rest/services/authentication.rs index cae1613..269ccf3 100644 --- a/src/frontend/rest/services/authentication.rs +++ b/src/frontend/rest/services/authentication.rs @@ -187,8 +187,12 @@ pub fn handle(service: &WebService, _req: Request) -> InternalFuture { _req.body() .concat2() .map(move |body| { - let req: AuthRequest = - serde_json::from_slice(&body).log_expect("Malformed request"); + let req = serde_json::from_slice::(&body); + if req.is_err() { + warn!("Failed to parse auth request from the frontend"); + return default_future(Response::new().with_status(hyper::StatusCode::BadRequest)); + } + let req = req.unwrap(); // Determine which credentials we should use let (username, token) = { diff --git a/ui/src/views/AuthenticationView.vue b/ui/src/views/AuthenticationView.vue index b3b6064..94b9f5d 100644 --- a/ui/src/views/AuthenticationView.vue +++ b/ui/src/views/AuthenticationView.vue @@ -19,7 +19,7 @@

{{ $t('auth.token') }}

- +

{{ $t('auth.paste') }}

@@ -30,11 +30,7 @@
- - {{ $t('auth.login_failed') }} - - - + {{ $t('auth.login_failed') }} @@ -89,7 +85,10 @@ export default { }, computed: { show_header: function () { - return !this.browser_opened && !this.verification_opened && !this.invalid_token + return !this.browser_opened && !this.verification_opened + }, + show_error: function () { + return this.invalid_login || this.invalid_token }, invalid_login: function () { return this.verification_opened && !this.$root.is_authenticated @@ -113,6 +112,10 @@ export default { }, // setter set: function (newValue) { + if (!newValue || !newValue.trim()) { + this.invalid_token = true + return + } try { const split = atob(newValue).split(':') this.$root.$data.username = split[0] @@ -129,10 +132,10 @@ export default { this.$router.go(-1) }, paste: function () { - document.getElementById('token').focus() + window.document.getElementById('token').focus() const that = this - navigator.clipboard.readText().then(function (v) { - that.combined_token = v + window.navigator.clipboard.readText().then(function (v) { + that.combined_token = v.trim() }).catch(function () {}) }, launch_browser: function (url) { @@ -146,7 +149,18 @@ export default { } }).catch(function () {}) }, + blink_error: function () { + const target = document.getElementById('invalid-token') + target.classList.add('blink-block') + setTimeout(function () { + target.classList.remove('blink-block') + }, 1200) + }, verify_token: function () { + if (this.invalid_token) { + this.blink_error() + return + } this.loading = true this.browser_opened = false this.$root.check_authentication(this.success, this.error) @@ -170,7 +184,19 @@ export default { error: function () { this.loading = false this.verification_opened = true + this.blink_error() } } } + +