diff --git a/.trellis/spec/backend/logging-guidelines.md b/.trellis/spec/backend/logging-guidelines.md
index 365c238..9a1670f 100644
--- a/.trellis/spec/backend/logging-guidelines.md
+++ b/.trellis/spec/backend/logging-guidelines.md
@@ -144,3 +144,74 @@ the server-side exception.
```
+
+## Scenario: Login Diagnostic Logging
+
+### 1. Scope / Trigger
+
+- Trigger: Windows deployment login failures need server-side diagnostics across
+ `LoginServlet -> AuthServiceImpl -> JdbcUserDao -> JdbcUtil` without changing
+ the generic user-facing login messages.
+
+### 2. Signatures
+
+- Servlet route: `POST /login` with `username`, `password`, and optional
+ same-application `redirect`.
+- Service signature: `AuthService.authenticate(String username, String password)`.
+- DAO signature: `UserDao.findActiveByUsername(String username)`.
+- DB config keys: `db.driver`, `db.url`, `db.username`, and `db.password`.
+
+### 3. Contracts
+
+- Login request logs may include remote address, context path, redirect presence,
+ username presence/length, sanitized username, and whether normalization changed
+ the username.
+- Authentication logs must distinguish missing required fields, active user not
+ found, password mismatch, service error, and success.
+- JDBC logs must confirm `db.properties` loading, required key resolution,
+ connection attempts, successful connections, and driver/connection failures.
+- Logs must never include raw passwords, password hashes, salts, database
+ passwords, or unredacted password-like JDBC URL parameters.
+
+### 4. Validation & Error Matrix
+
+- Missing username or password -> log missing-field category and return the
+ existing required-field message.
+- Unknown or inactive username -> log `active-user-not-found` and return the
+ existing invalid-credentials message.
+- Existing user with bad password -> log `password-mismatch` and return the
+ existing invalid-credentials message.
+- Missing DB config or JDBC failure -> log server-side details with credentials
+ redacted and return the existing service-unavailable message.
+
+### 5. Good/Base/Bad Cases
+
+- Good: a failed login shows whether the request reached the servlet, whether
+ the username was normalized, whether the active user row was found, and
+ whether password verification failed.
+- Base: successful login keeps logging user ID and role only.
+- Bad: a diagnostic log writes `password`, `password_hash`, salt, or a JDBC URL
+ containing `password=secret`.
+
+### 6. Tests Required
+
+- Run `mvn test` or the documented Maven path to compile Servlet, service, DAO,
+ and utility code.
+- Scan changed logs for password/hash/salt/database-password output before
+ finishing.
+- Keep `AuthServiceCheck` behavior expectations unchanged for required fields,
+ invalid credentials, success, permission checks, and DAO failure fallback.
+
+### 7. Wrong vs Correct
+
+#### Wrong
+
+```java
+LOGGER.info("Login failed password=" + password + " hash=" + user.getPasswordHash());
+```
+
+#### Correct
+
+```java
+LOGGER.info("Login failed reason=password-mismatch userId=" + user.getId());
+```
diff --git a/.trellis/spec/frontend/component-guidelines.md b/.trellis/spec/frontend/component-guidelines.md
index 77b5caf..1f8afbe 100644
--- a/.trellis/spec/frontend/component-guidelines.md
+++ b/.trellis/spec/frontend/component-guidelines.md
@@ -20,6 +20,13 @@ the reusable UI units.
application frame lives in `src/main/webapp/WEB-INF/jsp/common/header.jspf`
and owns the dark sidebar, top utility bar, role workbench links, module
navigation, global search, user display, and logout link.
+- Any `.jspf` fragment that contains user-visible Simplified Chinese text must
+ declare `<%@ page pageEncoding="UTF-8" %>` at the top. Do not rely only on the
+ including JSP page or response `Content-Type`; Tomcat/Jasper can otherwise
+ compile the fragment with a non-UTF-8 default and render mojibake.
+- JSP-rendered HTML responses must be served as `text/html;charset=UTF-8` by
+ the encoding filter or the JSP page directive. Request/response character
+ encoding alone is not enough for browsers to decode Simplified Chinese safely.
- Preserve role-conditioned navigation in that shared frame: administrator-only
links stay inside `sessionScope.userRole == 'administrator'`; staff links stay
inside `administrator or librarian`; reader-only links stay inside
diff --git a/.trellis/tasks/04-28-windows-login-diagnostic-logs/check.jsonl b/.trellis/tasks/04-28-windows-login-diagnostic-logs/check.jsonl
new file mode 100644
index 0000000..62bc5f5
--- /dev/null
+++ b/.trellis/tasks/04-28-windows-login-diagnostic-logs/check.jsonl
@@ -0,0 +1,4 @@
+{"file": ".trellis/spec/backend/index.md", "reason": "Check backend architecture boundaries for login diagnostics."}
+{"file": ".trellis/spec/backend/logging-guidelines.md", "reason": "Verify logs avoid passwords, hashes, salts, and credentials while remaining useful."}
+{"file": ".trellis/spec/backend/database-guidelines.md", "reason": "Verify login/authentication and database config contracts remain intact."}
+{"file": ".trellis/spec/backend/quality-guidelines.md", "reason": "Verify Maven checks and backend quality expectations."}
diff --git a/.trellis/tasks/04-28-windows-login-diagnostic-logs/implement.jsonl b/.trellis/tasks/04-28-windows-login-diagnostic-logs/implement.jsonl
new file mode 100644
index 0000000..ecada99
--- /dev/null
+++ b/.trellis/tasks/04-28-windows-login-diagnostic-logs/implement.jsonl
@@ -0,0 +1,4 @@
+{"file": ".trellis/spec/backend/index.md", "reason": "Backend Servlet/JSP/JDBC architecture context for login diagnostics."}
+{"file": ".trellis/spec/backend/logging-guidelines.md", "reason": "Logging safety rules, sensitive-data redaction, and diagnostic expectations."}
+{"file": ".trellis/spec/backend/database-guidelines.md", "reason": "Login/authentication and database configuration contracts."}
+{"file": ".trellis/spec/backend/quality-guidelines.md", "reason": "Backend quality and Maven verification requirements."}
diff --git a/.trellis/tasks/04-28-windows-login-diagnostic-logs/prd.md b/.trellis/tasks/04-28-windows-login-diagnostic-logs/prd.md
new file mode 100644
index 0000000..9cb6f86
--- /dev/null
+++ b/.trellis/tasks/04-28-windows-login-diagnostic-logs/prd.md
@@ -0,0 +1,70 @@
+# Add Windows Login Diagnostic Logs
+
+## Goal
+
+Add safe server-side diagnostic logs to the login/authentication path so a Windows-built deployment that returns `用户名或密码不正确。` can be diagnosed without exposing passwords, password hashes, or database credentials.
+
+## What I Already Know
+
+* The previous frontend rebuild task is solved and has been archived.
+* On the Windows system build, login now reaches the invalid-credentials path: `用户名或密码不正确。`
+* The user believes the database connection is probably already working.
+* Existing login flow is `LoginServlet` -> `AuthServiceImpl` -> `JdbcUserDao.findActiveByUsername` -> `JdbcUtil`.
+* `AuthServiceImpl` currently logs only generic login failure/success/service-error messages.
+* Existing backend specs require login failures to keep the same generic user-facing message and to log server-side details for unavailable services.
+
+## Requirements
+
+* Add diagnostic logging around login POST handling, authentication lookup, password verification outcome, and database configuration/connection attempts.
+* Logs must help distinguish:
+ * request reached `LoginServlet`;
+ * username normalization changed the submitted username;
+ * active user row was not found;
+ * user row was found but password verification failed;
+ * database configuration was loaded and which JDBC URL/user key were used, with secrets redacted;
+ * JDBC driver/connection failures if they happen.
+* Do not log raw passwords, password hashes, salts, database passwords, or full sensitive config values.
+* Preserve the current user-facing Chinese error message and login behavior.
+* Keep the implementation in the existing Servlet + service + DAO + JDBC stack.
+* Prefer `java.util.logging` patterns already used in the project.
+
+## Acceptance Criteria
+
+* [x] Login failure logs identify whether the username was absent, not found, or found with password mismatch.
+* [x] Login request logs include safe request diagnostics such as remote address, context path, redirect presence, and submitted username length or sanitized username.
+* [x] Database logs confirm `db.properties` loading and JDBC connection attempts with password redacted.
+* [x] No log statement outputs a raw password, password hash, salt, or database password.
+* [x] Existing login success/failure behavior remains unchanged for users.
+* [x] `mvn test` or the closest available Maven verification command succeeds.
+
+## Definition Of Done
+
+* Diagnostic logging implemented in source.
+* Maven verification run and results reported.
+* No database schema changes.
+* No unrelated frontend/layout changes.
+
+## Out Of Scope
+
+* Changing password hashing rules or seed user credentials.
+* Adding a new logging framework.
+* Changing database schema or production credentials.
+* Reworking the login UI.
+* Committing generated build artifacts.
+
+## Technical Notes
+
+* Likely impacted files:
+ * `src/main/java/com/mzh/library/controller/LoginServlet.java`
+ * `src/main/java/com/mzh/library/service/impl/AuthServiceImpl.java`
+ * `src/main/java/com/mzh/library/dao/impl/JdbcUserDao.java`
+ * `src/main/java/com/mzh/library/util/JdbcUtil.java`
+* Relevant specs:
+ * `.trellis/spec/backend/logging-guidelines.md`
+ * `.trellis/spec/backend/database-guidelines.md`
+ * `.trellis/spec/backend/quality-guidelines.md`
+* Verification completed at 2026-04-28 18:22 +0800:
+ * `/home/sjy/.sdkman/candidates/maven/current/bin/mvn test` passed with `BUILD SUCCESS`.
+ * `/home/sjy/.sdkman/candidates/maven/current/bin/mvn package` passed with `BUILD SUCCESS` and produced `target/library-management.war`.
+ * `git diff --check` passed.
+ * Sensitive logger scan only found boolean password state fields, `password=`, and `password-mismatch` category labels.
diff --git a/.trellis/tasks/04-28-windows-login-diagnostic-logs/task.json b/.trellis/tasks/04-28-windows-login-diagnostic-logs/task.json
new file mode 100644
index 0000000..86b1dfc
--- /dev/null
+++ b/.trellis/tasks/04-28-windows-login-diagnostic-logs/task.json
@@ -0,0 +1,26 @@
+{
+ "id": "windows-login-diagnostic-logs",
+ "name": "windows-login-diagnostic-logs",
+ "title": "Add Windows login diagnostic logs",
+ "description": "",
+ "status": "in_progress",
+ "dev_type": null,
+ "scope": null,
+ "package": null,
+ "priority": "P2",
+ "creator": "Zzzz",
+ "assignee": "Zzzz",
+ "createdAt": "2026-04-28",
+ "completedAt": null,
+ "branch": null,
+ "base_branch": "master",
+ "worktree_path": null,
+ "commit": null,
+ "pr_url": null,
+ "subtasks": [],
+ "children": [],
+ "parent": null,
+ "relatedFiles": [],
+ "notes": "",
+ "meta": {}
+}
\ No newline at end of file
diff --git a/.trellis/tasks/archive/2026-04/04-28-04-28-rebuild-current-frontend/check.jsonl b/.trellis/tasks/archive/2026-04/04-28-04-28-rebuild-current-frontend/check.jsonl
new file mode 100644
index 0000000..1a7a7a9
--- /dev/null
+++ b/.trellis/tasks/archive/2026-04/04-28-04-28-rebuild-current-frontend/check.jsonl
@@ -0,0 +1,6 @@
+{"file": ".trellis/spec/frontend/index.md", "reason": "Frontend checklist for reviewing JSP/CSS presentation changes."}
+{"file": ".trellis/spec/frontend/component-guidelines.md", "reason": "Verify shared frame role navigation and Simplified Chinese copy remain correct."}
+{"file": ".trellis/spec/frontend/quality-guidelines.md", "reason": "Verify layout, accessibility basics, and no obvious overlap/clipping."}
+{"file": ".trellis/spec/backend/index.md", "reason": "Verify encoding changes remain within Servlet/JSP architecture."}
+{"file": ".trellis/spec/backend/quality-guidelines.md", "reason": "Verify layer boundaries and Maven build/test expectations."}
+{"file": ".trellis/tasks/archive/2026-04/00-bootstrap-guidelines/research/project-requirements.md", "reason": "Confirm the change preserves the agreed JSP + Servlet + Tomcat stack."}
diff --git a/.trellis/tasks/archive/2026-04/04-28-04-28-rebuild-current-frontend/implement.jsonl b/.trellis/tasks/archive/2026-04/04-28-04-28-rebuild-current-frontend/implement.jsonl
new file mode 100644
index 0000000..4ea3144
--- /dev/null
+++ b/.trellis/tasks/archive/2026-04/04-28-04-28-rebuild-current-frontend/implement.jsonl
@@ -0,0 +1,7 @@
+{"file": ".trellis/spec/frontend/index.md", "reason": "Frontend JSP/CSS presentation conventions and checklist for authenticated UI work."}
+{"file": ".trellis/spec/frontend/directory-structure.md", "reason": "JSP fragment and static asset placement constraints."}
+{"file": ".trellis/spec/frontend/component-guidelines.md", "reason": "Shared header/sidebar fragment rules, role-conditioned navigation, and Simplified Chinese copy requirements."}
+{"file": ".trellis/spec/frontend/quality-guidelines.md", "reason": "UI quality checks for JSP/CSS layout, accessibility basics, and visual consistency."}
+{"file": ".trellis/spec/backend/index.md", "reason": "Servlet/JSP/Tomcat architecture context for the encoding filter change."}
+{"file": ".trellis/spec/backend/quality-guidelines.md", "reason": "Layer-boundary and Maven verification requirements for backend-adjacent changes."}
+{"file": ".trellis/tasks/archive/2026-04/00-bootstrap-guidelines/research/project-requirements.md", "reason": "Original project stack and presentation-layer requirements."}
diff --git a/.trellis/tasks/archive/2026-04/04-28-04-28-rebuild-current-frontend/prd.md b/.trellis/tasks/archive/2026-04/04-28-04-28-rebuild-current-frontend/prd.md
new file mode 100644
index 0000000..8891a3c
--- /dev/null
+++ b/.trellis/tasks/archive/2026-04/04-28-04-28-rebuild-current-frontend/prd.md
@@ -0,0 +1,83 @@
+# Fix Frontend Encoding And Layout
+
+## Goal
+
+Fix the authenticated JSP frontend so Simplified Chinese text renders correctly in the browser, then refine the shared application frame and dashboard layout so navigation, role workbench links, search, user identity, and page content look coordinated at common desktop and mobile widths.
+
+## What I Already Know
+
+* The user wants to view the actual frontend UI after the frontend refactor.
+* The running Tomcat application appears to show the pre-refactor UI.
+* The project is a Java 11 Maven WAR application.
+* Maven produces `target/library-management.war`.
+* Frontend assets and JSPs live under `src/main/webapp`.
+* Local Tomcat path is `/home/sjy/apps/tomcat/apache-tomcat-9.0.117/apache-tomcat-9.0.117`.
+* Local MySQL is running at `127.0.0.1:3306`.
+* The user now sees severe mojibake such as `书 å¾ä¹¦ç®¡çç³»ç»`, which is UTF-8 Chinese content being decoded as a non-UTF-8 encoding.
+* The visible broken area is the authenticated shell: sidebar brand, role workbench, module navigation, topbar search, notification, user pill, and role label.
+* JSP pages already declare `contentType="text/html;charset=UTF-8"` and ``; `CharacterEncodingFilter` currently sets request/response character encoding but does not force an HTML content type.
+* Follow-up user screenshot shows the authenticated shell still renders as ordinary document-flow text: the dark fixed sidebar is missing, the topbar is loose, and the dashboard metric cards collapse into a vertical text column. HTML and CSS endpoint checks alone are not sufficient.
+
+## Requirements
+
+* Ensure every JSP-rendered HTML response is explicitly served as UTF-8 so Chinese labels, placeholders, headings, and role names do not render as mojibake.
+* Preserve the JSP + Servlet + CSS stack; do not introduce a frontend framework.
+* Keep all user-facing JSP copy in Simplified Chinese.
+* Refine the shared authenticated frame in `header.jspf`/CSS:
+ * Sidebar brand and role workbench should be readable and not visually crowded.
+ * Navigation links should align consistently and avoid repeated glyph/text collisions.
+ * Topbar search, notification, user display, and role label should fit without overlap.
+* Refine dashboard layout in CSS so metric cards, search/ranking panels, tables, and shortcut cards have balanced spacing and degrade cleanly on narrower viewports.
+* Rebuild and redeploy the WAR to the local Tomcat instance after source changes.
+* Verify `/library-management/login` is reachable and a known login reaches `/library-management/dashboard`.
+* Verify the dashboard HTML/headers indicate UTF-8 and the rendered shell text is readable Chinese.
+* Verify the rendered page visually in a browser at desktop width:
+ * A dark fixed left sidebar must be visible.
+ * The topbar must start to the right of the sidebar and align search/user controls.
+ * Dashboard content must start below the topbar and to the right of the sidebar.
+ * Metrics must render as cards in a grid on desktop, not as plain vertical text.
+ * No overlapping, no unstyled header text, and no horizontal crowding at 1920px-wide desktop.
+
+## Acceptance Criteria
+
+* [x] `mvn clean package` succeeds after the frontend/encoding changes.
+* [x] Tomcat `webapps/library-management.war` is refreshed from `target/library-management.war`.
+* [x] Old expanded deployment directory is removed before restart.
+* [x] Tomcat listens on port `8080`.
+* [x] `/library-management/login` returns HTTP 200.
+* [x] `admin/admin123` login redirects to `/library-management/dashboard`.
+* [x] Authenticated dashboard response uses UTF-8 and no longer displays mojibake for Chinese UI text.
+* [ ] Sidebar, role chips, topbar search/actions, dashboard panels, and responsive layout avoid obvious overlap, clipping, duplicated visual noise, and unstyled document-flow rendering in an actual browser screenshot.
+
+## Definition Of Done
+
+* Encoding fix implemented in source.
+* Layout refinement implemented in JSP/CSS source.
+* Rebuild and deploy completed.
+* Verification results reported to the user.
+* No database schema changes or unrelated backend behavior changes.
+
+## Out Of Scope
+
+* Replacing the JSP/CSS frontend with React, Vue, or another SPA framework.
+* Changing database schema or seed data.
+* Committing build artifacts.
+* Reworking business workflows beyond what is needed to render the current pages correctly.
+
+## Technical Notes
+
+* Build command from README: `/home/sjy/.sdkman/candidates/maven/current/bin/mvn clean package` if `mvn` is unavailable.
+* Deployment target: `/home/sjy/apps/tomcat/apache-tomcat-9.0.117/apache-tomcat-9.0.117/webapps/library-management.war`.
+* Rebuild completed at 2026-04-28 16:55 +0800; deployed WAR size is 4,489,937 bytes.
+* Previous deployment was moved to `/home/sjy/apps/tomcat/apache-tomcat-9.0.117/apache-tomcat-9.0.117/deploy-backups/_pre-rebuild-20260428-1656/`.
+* Deployed `static/css/app.css` is byte-for-byte identical to `src/main/webapp/static/css/app.css`.
+* Likely impacted files from inspection:
+ * `src/main/java/com/mzh/library/filter/CharacterEncodingFilter.java`
+ * `src/main/webapp/WEB-INF/jsp/common/header.jspf`
+ * `src/main/webapp/WEB-INF/jsp/dashboard.jsp`
+ * `src/main/webapp/static/css/app.css`
+* Final verification completed at 2026-04-28 17:34 +0800:
+ * `/library-management/login` returns `200` with `Content-Type: text/html;charset=UTF-8`.
+ * `admin/admin123` login reaches `/library-management/dashboard` with UTF-8 content.
+ * Dashboard HTML contains readable Chinese markers including `图书管理系统`, `角色工作台`, `管理员工作台`, `馆藏检索`, `用户管理`, `系统日志`, and `退出登录`.
+* Follow-up visual regression reported after that verification: screenshot shows the authenticated shell unstyled at desktop width despite readable Chinese. Future verification must include a browser screenshot or equivalent computed-style/layout assertion, not only `curl`.
diff --git a/.trellis/tasks/archive/2026-04/04-28-04-28-rebuild-current-frontend/task.json b/.trellis/tasks/archive/2026-04/04-28-04-28-rebuild-current-frontend/task.json
new file mode 100644
index 0000000..94325c8
--- /dev/null
+++ b/.trellis/tasks/archive/2026-04/04-28-04-28-rebuild-current-frontend/task.json
@@ -0,0 +1,26 @@
+{
+ "id": "04-28-rebuild-current-frontend",
+ "name": "04-28-rebuild-current-frontend",
+ "title": "rebuild and redeploy current frontend",
+ "description": "",
+ "status": "completed",
+ "dev_type": null,
+ "scope": null,
+ "package": null,
+ "priority": "P2",
+ "creator": "Zzzz",
+ "assignee": "Zzzz",
+ "createdAt": "2026-04-28",
+ "completedAt": "2026-04-28",
+ "branch": null,
+ "base_branch": "master",
+ "worktree_path": null,
+ "commit": null,
+ "pr_url": null,
+ "subtasks": [],
+ "children": [],
+ "parent": null,
+ "relatedFiles": [],
+ "notes": "",
+ "meta": {}
+}
\ No newline at end of file
diff --git a/src/main/java/com/mzh/library/controller/LoginServlet.java b/src/main/java/com/mzh/library/controller/LoginServlet.java
index 185b664..74caad0 100644
--- a/src/main/java/com/mzh/library/controller/LoginServlet.java
+++ b/src/main/java/com/mzh/library/controller/LoginServlet.java
@@ -8,6 +8,7 @@ import com.mzh.library.service.impl.AuthServiceImpl;
import com.mzh.library.util.SessionAttributes;
import java.io.IOException;
+import java.util.logging.Logger;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
@@ -16,6 +17,7 @@ import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
public class LoginServlet extends HttpServlet {
+ private static final Logger LOGGER = Logger.getLogger(LoginServlet.class.getName());
private static final String LOGIN_JSP = "/WEB-INF/jsp/auth/login.jsp";
private static final String DASHBOARD_PATH = "/dashboard";
private static final int SESSION_TIMEOUT_SECONDS = 30 * 60;
@@ -40,9 +42,13 @@ public class LoginServlet extends HttpServlet {
@Override
protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
- String username = trim(request.getParameter("username"));
+ String submittedUsername = request.getParameter("username");
+ String username = trim(submittedUsername);
String password = request.getParameter("password");
- String redirect = safeRedirect(request.getParameter("redirect"));
+ String submittedRedirect = request.getParameter("redirect");
+ String redirect = safeRedirect(submittedRedirect);
+
+ logLoginPost(request, submittedUsername, username, password, submittedRedirect, redirect);
AuthenticationResult result = authService.authenticate(username, password);
if (!result.isAuthenticated()) {
@@ -57,6 +63,26 @@ public class LoginServlet extends HttpServlet {
response.sendRedirect(resolveRedirect(request, redirect));
}
+ private void logLoginPost(
+ HttpServletRequest request,
+ String submittedUsername,
+ String username,
+ String password,
+ String submittedRedirect,
+ String redirect
+ ) {
+ LOGGER.info("Login POST reached"
+ + " remoteAddr=" + safeLogValue(request.getRemoteAddr())
+ + " contextPath=" + safeLogValue(request.getContextPath())
+ + " redirectSubmitted=" + !trim(submittedRedirect).isEmpty()
+ + " redirectAccepted=" + !redirect.isEmpty()
+ + " usernameSubmitted=" + (submittedUsername != null)
+ + " usernameLength=" + length(submittedUsername)
+ + " normalizedUsernameLength=" + username.length()
+ + " usernameNormalizedChanged=" + !username.equals(nullToEmpty(submittedUsername))
+ + " passwordSubmitted=" + (password != null));
+ }
+
private boolean isAuthenticated(HttpServletRequest request) {
HttpSession session = request.getSession(false);
return session != null && session.getAttribute(SessionAttributes.AUTHENTICATED_USER) != null;
@@ -97,4 +123,29 @@ public class LoginServlet extends HttpServlet {
private String trim(String value) {
return value == null ? "" : value.trim();
}
+
+ private int length(String value) {
+ return value == null ? 0 : value.length();
+ }
+
+ private String nullToEmpty(String value) {
+ return value == null ? "" : value;
+ }
+
+ private String safeLogValue(String value) {
+ if (value == null) {
+ return "";
+ }
+
+ StringBuilder builder = new StringBuilder();
+ int limit = Math.min(value.length(), 120);
+ for (int i = 0; i < limit; i++) {
+ char current = value.charAt(i);
+ builder.append(Character.isISOControl(current) ? '?' : current);
+ }
+ if (value.length() > limit) {
+ builder.append("...");
+ }
+ return builder.toString();
+ }
}
diff --git a/src/main/java/com/mzh/library/dao/impl/JdbcUserDao.java b/src/main/java/com/mzh/library/dao/impl/JdbcUserDao.java
index 4c932fd..93f5b51 100644
--- a/src/main/java/com/mzh/library/dao/impl/JdbcUserDao.java
+++ b/src/main/java/com/mzh/library/dao/impl/JdbcUserDao.java
@@ -18,8 +18,11 @@ import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
+import java.util.logging.Level;
+import java.util.logging.Logger;
public class JdbcUserDao implements UserDao, UserAccountDao {
+ private static final Logger LOGGER = Logger.getLogger(JdbcUserDao.class.getName());
private static final String USER_COLUMNS = ""
+ "id, username, password_hash, display_name, role_code, active, created_at, updated_at ";
@@ -48,18 +51,27 @@ public class JdbcUserDao implements UserDao, UserAccountDao {
@Override
public Optional findActiveByUsername(String username) {
+ LOGGER.info("Active user lookup start username=" + safeLogValue(username)
+ + " usernameLength=" + length(username));
try (Connection connection = JdbcUtil.getConnection();
PreparedStatement statement = connection.prepareStatement(FIND_ACTIVE_BY_USERNAME)) {
statement.setString(1, username);
try (ResultSet resultSet = statement.executeQuery()) {
if (!resultSet.next()) {
+ LOGGER.info("Active user lookup result=not-found username=" + safeLogValue(username));
return Optional.empty();
}
- return Optional.of(mapUser(resultSet));
+ User user = mapUser(resultSet);
+ LOGGER.info("Active user lookup result=found"
+ + " userId=" + user.getId()
+ + " role=" + user.getRole().getCode()
+ + " username=" + safeLogValue(username));
+ return Optional.of(user);
}
} catch (SQLException | IllegalArgumentException ex) {
+ LOGGER.log(Level.SEVERE, "Active user lookup failed username=" + safeLogValue(username), ex);
throw new DaoException("Unable to load active user by username", ex);
}
}
@@ -205,4 +217,25 @@ public class JdbcUserDao implements UserDao, UserAccountDao {
private LocalDateTime toLocalDateTime(Timestamp timestamp) {
return timestamp == null ? null : timestamp.toLocalDateTime();
}
+
+ private int length(String value) {
+ return value == null ? 0 : value.length();
+ }
+
+ private String safeLogValue(String value) {
+ if (value == null) {
+ return "";
+ }
+
+ StringBuilder builder = new StringBuilder();
+ int limit = Math.min(value.length(), 120);
+ for (int i = 0; i < limit; i++) {
+ char current = value.charAt(i);
+ builder.append(Character.isISOControl(current) ? '?' : current);
+ }
+ if (value.length() > limit) {
+ builder.append("...");
+ }
+ return builder.toString();
+ }
}
diff --git a/src/main/java/com/mzh/library/filter/CharacterEncodingFilter.java b/src/main/java/com/mzh/library/filter/CharacterEncodingFilter.java
index 15daa81..3469523 100644
--- a/src/main/java/com/mzh/library/filter/CharacterEncodingFilter.java
+++ b/src/main/java/com/mzh/library/filter/CharacterEncodingFilter.java
@@ -8,6 +8,7 @@ import javax.servlet.FilterConfig;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
public class CharacterEncodingFilter implements Filter {
private String encoding = "UTF-8";
@@ -25,6 +26,39 @@ public class CharacterEncodingFilter implements Filter {
throws IOException, ServletException {
request.setCharacterEncoding(encoding);
response.setCharacterEncoding(encoding);
+ if (isHtmlRequest(request)) {
+ response.setContentType("text/html;charset=" + encoding);
+ }
chain.doFilter(request, response);
}
+
+ private boolean isHtmlRequest(ServletRequest request) {
+ if (!(request instanceof HttpServletRequest)) {
+ return true;
+ }
+
+ HttpServletRequest httpRequest = (HttpServletRequest) request;
+ String contextPath = httpRequest.getContextPath();
+ String requestUri = httpRequest.getRequestURI();
+ String path = requestUri.substring(contextPath.length());
+ return !path.startsWith("/static/")
+ && !path.equals("/favicon.ico")
+ && !hasStaticAssetExtension(path);
+ }
+
+ private boolean hasStaticAssetExtension(String path) {
+ String normalizedPath = path.toLowerCase();
+ return normalizedPath.endsWith(".css")
+ || normalizedPath.endsWith(".js")
+ || normalizedPath.endsWith(".png")
+ || normalizedPath.endsWith(".jpg")
+ || normalizedPath.endsWith(".jpeg")
+ || normalizedPath.endsWith(".gif")
+ || normalizedPath.endsWith(".svg")
+ || normalizedPath.endsWith(".ico")
+ || normalizedPath.endsWith(".woff")
+ || normalizedPath.endsWith(".woff2")
+ || normalizedPath.endsWith(".ttf")
+ || normalizedPath.endsWith(".map");
+ }
}
diff --git a/src/main/java/com/mzh/library/service/impl/AuthServiceImpl.java b/src/main/java/com/mzh/library/service/impl/AuthServiceImpl.java
index ae71761..328770b 100644
--- a/src/main/java/com/mzh/library/service/impl/AuthServiceImpl.java
+++ b/src/main/java/com/mzh/library/service/impl/AuthServiceImpl.java
@@ -36,24 +36,49 @@ public class AuthServiceImpl implements AuthService {
@Override
public AuthenticationResult authenticate(String username, String password) {
String normalizedUsername = normalizeUsername(username);
- if (normalizedUsername.isEmpty() || password == null || password.trim().isEmpty()) {
+ if (!normalizedUsername.equals(nullToEmpty(username))) {
+ LOGGER.info("Login username normalized"
+ + " usernameSubmitted=" + (username != null)
+ + " usernameLength=" + length(username)
+ + " normalizedUsernameLength=" + normalizedUsername.length()
+ + " normalizedUsername=" + safeLogValue(normalizedUsername));
+ }
+
+ boolean usernameMissing = normalizedUsername.isEmpty();
+ boolean passwordMissing = password == null || password.trim().isEmpty();
+ if (usernameMissing || passwordMissing) {
+ LOGGER.info("Login rejected reason=missing-required"
+ + " usernameSubmitted=" + (username != null)
+ + " usernameMissing=" + usernameMissing
+ + " passwordSubmitted=" + (password != null)
+ + " passwordMissing=" + passwordMissing);
return AuthenticationResult.failure(REQUIRED_MESSAGE);
}
try {
+ LOGGER.info("Login lookup start username=" + safeLogValue(normalizedUsername));
Optional user = userDao.findActiveByUsername(normalizedUsername);
- if (!user.isPresent() || !PasswordHasher.verify(password, user.get().getPasswordHash())) {
- LOGGER.info("Login failed for username=" + normalizedUsername);
+ if (!user.isPresent()) {
+ LOGGER.info("Login failed reason=active-user-not-found username=" + safeLogValue(normalizedUsername));
return AuthenticationResult.failure(INVALID_MESSAGE);
}
- User authenticated = user.get();
+ User candidate = user.get();
+ if (!PasswordHasher.verify(password, candidate.getPasswordHash())) {
+ LOGGER.info("Login failed reason=password-mismatch"
+ + " userId=" + candidate.getId()
+ + " role=" + candidate.getRole().getCode()
+ + " username=" + safeLogValue(normalizedUsername));
+ return AuthenticationResult.failure(INVALID_MESSAGE);
+ }
+
+ User authenticated = candidate;
Set permissions = permissionPolicy.permissionsFor(authenticated.getRole());
AuthenticatedUser sessionUser = AuthenticatedUser.from(authenticated, permissions);
LOGGER.info("Login success userId=" + authenticated.getId() + " role=" + authenticated.getRole().getCode());
return AuthenticationResult.success(sessionUser);
} catch (DaoException | IllegalStateException ex) {
- LOGGER.log(Level.SEVERE, "Login service error for username=" + normalizedUsername, ex);
+ LOGGER.log(Level.SEVERE, "Login service error for username=" + safeLogValue(normalizedUsername), ex);
return AuthenticationResult.failure(UNAVAILABLE_MESSAGE);
}
}
@@ -66,4 +91,29 @@ public class AuthServiceImpl implements AuthService {
private String normalizeUsername(String username) {
return username == null ? "" : username.trim();
}
+
+ private String nullToEmpty(String value) {
+ return value == null ? "" : value;
+ }
+
+ private int length(String value) {
+ return value == null ? 0 : value.length();
+ }
+
+ private String safeLogValue(String value) {
+ if (value == null) {
+ return "";
+ }
+
+ StringBuilder builder = new StringBuilder();
+ int limit = Math.min(value.length(), 120);
+ for (int i = 0; i < limit; i++) {
+ char current = value.charAt(i);
+ builder.append(Character.isISOControl(current) ? '?' : current);
+ }
+ if (value.length() > limit) {
+ builder.append("...");
+ }
+ return builder.toString();
+ }
}
diff --git a/src/main/java/com/mzh/library/util/JdbcUtil.java b/src/main/java/com/mzh/library/util/JdbcUtil.java
index 82ce508..570445c 100644
--- a/src/main/java/com/mzh/library/util/JdbcUtil.java
+++ b/src/main/java/com/mzh/library/util/JdbcUtil.java
@@ -8,10 +8,17 @@ import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.SQLException;
import java.util.Properties;
+import java.util.logging.Level;
+import java.util.logging.Logger;
public final class JdbcUtil {
+ private static final Logger LOGGER = Logger.getLogger(JdbcUtil.class.getName());
private static final String CONFIG_FILE = "db.properties";
private static final String DEFAULT_DRIVER = "com.mysql.cj.jdbc.Driver";
+ private static final String DRIVER_KEY = "db.driver";
+ private static final String URL_KEY = "db.url";
+ private static final String USERNAME_KEY = "db.username";
+ private static final String PASSWORD_KEY = "db.password";
@FunctionalInterface
public interface TransactionCallback {
@@ -23,16 +30,42 @@ public final class JdbcUtil {
public static Connection getConnection() {
Properties properties = loadProperties();
- String driver = properties.getProperty("db.driver", DEFAULT_DRIVER);
- String url = required(properties, "db.url");
- String username = required(properties, "db.username");
- String password = required(properties, "db.password");
+ String driver = properties.getProperty(DRIVER_KEY, DEFAULT_DRIVER);
+ String url = required(properties, URL_KEY);
+ String username = required(properties, USERNAME_KEY);
+ String password = required(properties, PASSWORD_KEY);
+
+ LOGGER.info("Database connection configuration resolved"
+ + " file=" + CONFIG_FILE
+ + " driverKey=" + DRIVER_KEY
+ + " driver=" + safeLogValue(driver)
+ + " jdbcUrl=" + redactJdbcUrl(url)
+ + " usernameKey=" + USERNAME_KEY
+ + " usernameConfigured=" + !username.isEmpty()
+ + " password=");
+ LOGGER.info("Database connection attempt"
+ + " driverKey=" + DRIVER_KEY
+ + " driver=" + safeLogValue(driver)
+ + " jdbcUrl=" + redactJdbcUrl(url)
+ + " usernameKey=" + USERNAME_KEY);
try {
Class.forName(driver);
- return DriverManager.getConnection(url, username, password);
- } catch (ClassNotFoundException | SQLException ex) {
+ Connection connection = DriverManager.getConnection(url, username, password);
+ LOGGER.info("Database connection established jdbcUrl=" + redactJdbcUrl(url)
+ + " usernameKey=" + USERNAME_KEY);
+ return connection;
+ } catch (ClassNotFoundException ex) {
+ LOGGER.log(Level.SEVERE, "JDBC driver unavailable driver=" + safeLogValue(driver)
+ + " jdbcUrl=" + redactJdbcUrl(url)
+ + " usernameKey=" + USERNAME_KEY, ex);
throw new DaoException("Unable to open database connection", ex);
+ } catch (SQLException ex) {
+ SQLException safeException = safeSqlException(ex);
+ LOGGER.log(Level.SEVERE, "Database connection failed driver=" + safeLogValue(driver)
+ + " jdbcUrl=" + redactJdbcUrl(url)
+ + " usernameKey=" + USERNAME_KEY, safeException);
+ throw new DaoException("Unable to open database connection", safeException);
}
}
@@ -68,13 +101,20 @@ public final class JdbcUtil {
.getContextClassLoader()
.getResourceAsStream(CONFIG_FILE)) {
if (inputStream == null) {
+ LOGGER.severe("Database configuration file not found file=" + CONFIG_FILE);
throw new DaoException("Missing database configuration file: " + CONFIG_FILE, null);
}
Properties properties = new Properties();
properties.load(inputStream);
+ LOGGER.info("Database configuration loaded file=" + CONFIG_FILE
+ + " driverConfigured=" + hasText(properties, DRIVER_KEY)
+ + " urlConfigured=" + hasText(properties, URL_KEY)
+ + " usernameConfigured=" + hasText(properties, USERNAME_KEY)
+ + " passwordConfigured=" + hasText(properties, PASSWORD_KEY));
return properties;
} catch (IOException ex) {
+ LOGGER.log(Level.SEVERE, "Unable to read database configuration file=" + CONFIG_FILE, ex);
throw new DaoException("Unable to read database configuration", ex);
}
}
@@ -82,8 +122,55 @@ public final class JdbcUtil {
private static String required(Properties properties, String key) {
String value = properties.getProperty(key);
if (value == null || value.trim().isEmpty()) {
+ LOGGER.severe("Missing database configuration value key=" + key);
throw new DaoException("Missing database configuration value: " + key, null);
}
return value.trim();
}
+
+ private static String redactJdbcUrl(String value) {
+ if (value == null) {
+ return "";
+ }
+ return safeLogValue(redactSensitive(value));
+ }
+
+ private static SQLException safeSqlException(SQLException ex) {
+ SQLException safeException = new SQLException(
+ safeLogValue(redactSensitive(ex.getMessage())),
+ ex.getSQLState(),
+ ex.getErrorCode()
+ );
+ safeException.setStackTrace(ex.getStackTrace());
+ return safeException;
+ }
+
+ private static String redactSensitive(String value) {
+ if (value == null) {
+ return "";
+ }
+ return value.replaceAll("(?i)(password|pwd|pass|secret|token)(\\s*[=:]\\s*)([^;&\\s]*)", "$1$2");
+ }
+
+ private static boolean hasText(Properties properties, String key) {
+ String value = properties.getProperty(key);
+ return value != null && !value.trim().isEmpty();
+ }
+
+ private static String safeLogValue(String value) {
+ if (value == null) {
+ return "";
+ }
+
+ StringBuilder builder = new StringBuilder();
+ int limit = Math.min(value.length(), 240);
+ for (int i = 0; i < limit; i++) {
+ char current = value.charAt(i);
+ builder.append(Character.isISOControl(current) ? '?' : current);
+ }
+ if (value.length() > limit) {
+ builder.append("...");
+ }
+ return builder.toString();
+ }
}
diff --git a/src/main/webapp/WEB-INF/jsp/admin/users/form.jsp b/src/main/webapp/WEB-INF/jsp/admin/users/form.jsp
index 4de884d..5604559 100644
--- a/src/main/webapp/WEB-INF/jsp/admin/users/form.jsp
+++ b/src/main/webapp/WEB-INF/jsp/admin/users/form.jsp
@@ -7,7 +7,7 @@
<c:out value="${formTitle}" /> - MZH 图书馆
-
+
<%@ include file="/WEB-INF/jsp/common/header.jspf" %>
diff --git a/src/main/webapp/WEB-INF/jsp/admin/users/manage.jsp b/src/main/webapp/WEB-INF/jsp/admin/users/manage.jsp
index f12aff3..00965bb 100644
--- a/src/main/webapp/WEB-INF/jsp/admin/users/manage.jsp
+++ b/src/main/webapp/WEB-INF/jsp/admin/users/manage.jsp
@@ -7,7 +7,7 @@
用户管理 - MZH 图书馆
-
+
<%@ include file="/WEB-INF/jsp/common/header.jspf" %>
diff --git a/src/main/webapp/WEB-INF/jsp/auth/login.jsp b/src/main/webapp/WEB-INF/jsp/auth/login.jsp
index ec0e189..b0ccb4e 100644
--- a/src/main/webapp/WEB-INF/jsp/auth/login.jsp
+++ b/src/main/webapp/WEB-INF/jsp/auth/login.jsp
@@ -7,7 +7,7 @@
登录 - MZH 图书馆
-
+
<%@ include file="/WEB-INF/jsp/common/header.jspf" %>
diff --git a/src/main/webapp/WEB-INF/jsp/auth/unauthorized.jsp b/src/main/webapp/WEB-INF/jsp/auth/unauthorized.jsp
index e200ba6..eaa56f2 100644
--- a/src/main/webapp/WEB-INF/jsp/auth/unauthorized.jsp
+++ b/src/main/webapp/WEB-INF/jsp/auth/unauthorized.jsp
@@ -6,7 +6,7 @@
无权限 - MZH 图书馆
-
+
<%@ include file="/WEB-INF/jsp/common/header.jspf" %>
diff --git a/src/main/webapp/WEB-INF/jsp/books/catalog.jsp b/src/main/webapp/WEB-INF/jsp/books/catalog.jsp
index 1712e70..061a0ed 100644
--- a/src/main/webapp/WEB-INF/jsp/books/catalog.jsp
+++ b/src/main/webapp/WEB-INF/jsp/books/catalog.jsp
@@ -7,7 +7,7 @@
馆藏检索 - MZH 图书馆
-
+
<%@ include file="/WEB-INF/jsp/common/header.jspf" %>
diff --git a/src/main/webapp/WEB-INF/jsp/books/categories.jsp b/src/main/webapp/WEB-INF/jsp/books/categories.jsp
index 6298690..def99cb 100644
--- a/src/main/webapp/WEB-INF/jsp/books/categories.jsp
+++ b/src/main/webapp/WEB-INF/jsp/books/categories.jsp
@@ -6,7 +6,7 @@
分类管理 - MZH 图书馆
-
+
<%@ include file="/WEB-INF/jsp/common/header.jspf" %>
diff --git a/src/main/webapp/WEB-INF/jsp/books/category-form.jsp b/src/main/webapp/WEB-INF/jsp/books/category-form.jsp
index ae11a4b..a146061 100644
--- a/src/main/webapp/WEB-INF/jsp/books/category-form.jsp
+++ b/src/main/webapp/WEB-INF/jsp/books/category-form.jsp
@@ -7,7 +7,7 @@
<c:out value="${formTitle}" /> - MZH 图书馆
-
+
<%@ include file="/WEB-INF/jsp/common/header.jspf" %>
diff --git a/src/main/webapp/WEB-INF/jsp/books/form.jsp b/src/main/webapp/WEB-INF/jsp/books/form.jsp
index 7bb8b99..ed9d430 100644
--- a/src/main/webapp/WEB-INF/jsp/books/form.jsp
+++ b/src/main/webapp/WEB-INF/jsp/books/form.jsp
@@ -7,7 +7,7 @@
<c:out value="${formTitle}" /> - MZH 图书馆
-
+
<%@ include file="/WEB-INF/jsp/common/header.jspf" %>
diff --git a/src/main/webapp/WEB-INF/jsp/books/manage.jsp b/src/main/webapp/WEB-INF/jsp/books/manage.jsp
index 7a1d311..5a87003 100644
--- a/src/main/webapp/WEB-INF/jsp/books/manage.jsp
+++ b/src/main/webapp/WEB-INF/jsp/books/manage.jsp
@@ -7,7 +7,7 @@
图书管理 - MZH 图书馆
-
+
<%@ include file="/WEB-INF/jsp/common/header.jspf" %>
diff --git a/src/main/webapp/WEB-INF/jsp/borrowing/form.jsp b/src/main/webapp/WEB-INF/jsp/borrowing/form.jsp
index 33c35b8..6341f66 100644
--- a/src/main/webapp/WEB-INF/jsp/borrowing/form.jsp
+++ b/src/main/webapp/WEB-INF/jsp/borrowing/form.jsp
@@ -7,7 +7,7 @@
新增借阅 - MZH 图书馆
-
+
<%@ include file="/WEB-INF/jsp/common/header.jspf" %>
diff --git a/src/main/webapp/WEB-INF/jsp/borrowing/manage.jsp b/src/main/webapp/WEB-INF/jsp/borrowing/manage.jsp
index b3ecca0..b1e7b1a 100644
--- a/src/main/webapp/WEB-INF/jsp/borrowing/manage.jsp
+++ b/src/main/webapp/WEB-INF/jsp/borrowing/manage.jsp
@@ -7,7 +7,7 @@
借阅管理 - MZH 图书馆
-
+
<%@ include file="/WEB-INF/jsp/common/header.jspf" %>
diff --git a/src/main/webapp/WEB-INF/jsp/common/header.jspf b/src/main/webapp/WEB-INF/jsp/common/header.jspf
index 0c04cc7..29f3acf 100644
--- a/src/main/webapp/WEB-INF/jsp/common/header.jspf
+++ b/src/main/webapp/WEB-INF/jsp/common/header.jspf
@@ -1,83 +1,102 @@
+<%@ page pageEncoding="UTF-8" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
-