diff --git a/src/services/admin/OnlineInterfaceService.java b/src/services/admin/OnlineInterfaceService.java index e4464fa6e..7280a812f 100644 --- a/src/services/admin/OnlineInterfaceService.java +++ b/src/services/admin/OnlineInterfaceService.java @@ -173,11 +173,13 @@ public class OnlineInterfaceService extends Service implements HttpServerCallbac synchronized (getUser) { try { getUser.setString(1, username); + boolean prevAuthenticated = session.isAuthenticated(); session.setAuthenticated(false); try (ResultSet cursor = getUser.executeQuery()) { session.setAuthenticated(cursor.next() && isUserValid(cursor, password)); if (session.isAuthenticated()) { - Log.i(TAG, "[%s] Successfully logged in to online interface", username); + if (!prevAuthenticated) + Log.i(TAG, "[%s] Successfully logged in to online interface", username); } else { Log.w(TAG, "[%s] Failed to login to online interface. Incorrect user/pass", username); socket.redirect(new URL("https", httpsServer.getBindAddress().getHostName(), httpsServer.getBindPort(), "/").toString()); diff --git a/src/services/admin/WebserverHandler.java b/src/services/admin/WebserverHandler.java index 594e3631f..de8434fc5 100644 --- a/src/services/admin/WebserverHandler.java +++ b/src/services/admin/WebserverHandler.java @@ -184,7 +184,7 @@ class WebserverHandler { if (session.isAuthenticated()) { file = new File("res/webserver/authenticated.html"); } - } else if (!session.isAuthenticated()) + } else if (!session.isAuthenticated() && !type.equals("text/css") && !type.equals("text/js") && !type.startsWith("image")) return null; if (type.equalsIgnoreCase("text/html")) return parseHtmlFile(file, getVariables).getBytes(ASCII);