Wed, 21 May 2025 14:19:07 +0200
fix "what's new" not shown after redirects + do not show it when accessed via RSS
184 | 1 | /* |
2 | * Copyright 2021 Mike Becker. All rights reserved. | |
3 | * | |
4 | * Redistribution and use in source and binary forms, with or without | |
5 | * modification, are permitted provided that the following conditions are met: | |
6 | * | |
7 | * 1. Redistributions of source code must retain the above copyright | |
8 | * notice, this list of conditions and the following disclaimer. | |
9 | * | |
10 | * 2. Redistributions in binary form must reproduce the above copyright | |
11 | * notice, this list of conditions and the following disclaimer in the | |
12 | * documentation and/or other materials provided with the distribution. | |
13 | * | |
14 | * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | |
15 | * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | |
16 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | |
17 | * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE | |
18 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | |
19 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR | |
20 | * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER | |
21 | * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, | |
22 | * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | |
23 | * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |
24 | */ | |
25 | ||
26 | package de.uapcore.lightpit | |
27 | ||
28 | import de.uapcore.lightpit.DataSourceProvider.Companion.SC_ATTR_NAME | |
29 | import de.uapcore.lightpit.dao.DataAccessObject | |
30 | import de.uapcore.lightpit.dao.createDataAccessObject | |
367
0a9065936aac
add "what's new" popup - resolves #670
Mike Becker <universe@uap-core.de>
parents:
358
diff
changeset
|
31 | import de.uapcore.lightpit.entities.User |
298
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
32 | import jakarta.servlet.http.Cookie |
254
55ca6cafc3dd
#233 migrate to Jakarta EE and update dependencies
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
33 | import jakarta.servlet.http.HttpServlet |
55ca6cafc3dd
#233 migrate to Jakarta EE and update dependencies
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
34 | import jakarta.servlet.http.HttpServletRequest |
55ca6cafc3dd
#233 migrate to Jakarta EE and update dependencies
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
35 | import jakarta.servlet.http.HttpServletResponse |
184 | 36 | import java.sql.SQLException |
335
1eed60b779da
change language menu to settings menu and add timezone settings - fixes #402
Mike Becker <universe@uap-core.de>
parents:
298
diff
changeset
|
37 | import java.time.ZoneId |
184 | 38 | import java.util.* |
367
0a9065936aac
add "what's new" popup - resolves #670
Mike Becker <universe@uap-core.de>
parents:
358
diff
changeset
|
39 | import java.sql.Date as SqlDate |
184 | 40 | |
247 | 41 | abstract class AbstractServlet : HttpServlet() { |
298
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
42 | |
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
43 | companion object { |
335
1eed60b779da
change language menu to settings menu and add timezone settings - fixes #402
Mike Becker <universe@uap-core.de>
parents:
298
diff
changeset
|
44 | const val COOKIE_MAX_AGE = 2592000 // 30 days |
298
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
45 | const val LANGUAGE_COOKIE_NAME = "lpit_language" |
335
1eed60b779da
change language menu to settings menu and add timezone settings - fixes #402
Mike Becker <universe@uap-core.de>
parents:
298
diff
changeset
|
46 | const val TIMEZONE_COOKIE_NAME = "lpit_timezone" |
298
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
47 | } |
247 | 48 | |
49 | protected val logger = MyLogger() | |
184 | 50 | |
51 | /** | |
52 | * Contains the GET request mappings. | |
53 | */ | |
54 | private val getMappings = mutableMapOf<PathPattern, MappingMethod>() | |
55 | ||
56 | /** | |
57 | * Contains the POST request mappings. | |
58 | */ | |
59 | private val postMappings = mutableMapOf<PathPattern, MappingMethod>() | |
60 | ||
61 | protected fun get(pattern: String, method: MappingMethod) { | |
62 | getMappings[PathPattern(pattern)] = method | |
63 | } | |
64 | ||
65 | protected fun post(pattern: String, method: MappingMethod) { | |
66 | postMappings[PathPattern(pattern)] = method | |
67 | } | |
68 | ||
69 | private fun notFound(http: HttpRequest, dao: DataAccessObject) { | |
70 | http.response.sendError(HttpServletResponse.SC_NOT_FOUND) | |
71 | } | |
72 | ||
73 | private fun findMapping( | |
74 | mappings: Map<PathPattern, MappingMethod>, | |
75 | req: HttpServletRequest | |
76 | ): Pair<PathPattern, MappingMethod> { | |
77 | val requestPath = sanitizedRequestPath(req) | |
78 | val candidates = mappings.filter { it.key.matches(requestPath) } | |
79 | return if (candidates.isEmpty()) { | |
80 | Pair(PathPattern(requestPath), ::notFound) | |
81 | } else { | |
82 | candidates.entries.first().toPair() | |
83 | } | |
84 | } | |
85 | ||
374
34abadbdd0e3
fix "what's new" not shown after redirects + do not show it when accessed via RSS
Mike Becker <universe@uap-core.de>
parents:
367
diff
changeset
|
86 | private fun forwardIfRequested(req: HttpServletRequest, resp: HttpServletResponse) { |
34abadbdd0e3
fix "what's new" not shown after redirects + do not show it when accessed via RSS
Mike Becker <universe@uap-core.de>
parents:
367
diff
changeset
|
87 | val site = req.getAttribute(Constants.REQ_ATTR_JSP) |
34abadbdd0e3
fix "what's new" not shown after redirects + do not show it when accessed via RSS
Mike Becker <universe@uap-core.de>
parents:
367
diff
changeset
|
88 | if (site != null) { |
34abadbdd0e3
fix "what's new" not shown after redirects + do not show it when accessed via RSS
Mike Becker <universe@uap-core.de>
parents:
367
diff
changeset
|
89 | req.getRequestDispatcher(Constants.JSP_PATH_PREFIX + site + ".jsp").forward(req, resp) |
34abadbdd0e3
fix "what's new" not shown after redirects + do not show it when accessed via RSS
Mike Becker <universe@uap-core.de>
parents:
367
diff
changeset
|
90 | } |
34abadbdd0e3
fix "what's new" not shown after redirects + do not show it when accessed via RSS
Mike Becker <universe@uap-core.de>
parents:
367
diff
changeset
|
91 | } |
34abadbdd0e3
fix "what's new" not shown after redirects + do not show it when accessed via RSS
Mike Becker <universe@uap-core.de>
parents:
367
diff
changeset
|
92 | |
184 | 93 | private fun invokeMapping( |
94 | mapping: Pair<PathPattern, MappingMethod>, | |
95 | req: HttpServletRequest, | |
96 | resp: HttpServletResponse, | |
97 | dao: DataAccessObject | |
98 | ) { | |
99 | val params = mapping.first.obtainPathParameters(sanitizedRequestPath(req)) | |
100 | val method = mapping.second | |
367
0a9065936aac
add "what's new" popup - resolves #670
Mike Becker <universe@uap-core.de>
parents:
358
diff
changeset
|
101 | val authenticatedUser = req.remoteUser?.let(dao::findUserByName) |
247 | 102 | logger.trace("invoke {0}", method) |
367
0a9065936aac
add "what's new" popup - resolves #670
Mike Becker <universe@uap-core.de>
parents:
358
diff
changeset
|
103 | method(HttpRequest(authenticatedUser, req, resp, params), dao) |
374
34abadbdd0e3
fix "what's new" not shown after redirects + do not show it when accessed via RSS
Mike Becker <universe@uap-core.de>
parents:
367
diff
changeset
|
104 | showWhatsNewPopup(authenticatedUser, req, resp, dao) |
34abadbdd0e3
fix "what's new" not shown after redirects + do not show it when accessed via RSS
Mike Becker <universe@uap-core.de>
parents:
367
diff
changeset
|
105 | forwardIfRequested(req, resp) |
184 | 106 | } |
107 | ||
108 | private fun sanitizedRequestPath(req: HttpServletRequest) = req.pathInfo ?: "/" | |
109 | ||
358 | 110 | protected fun sanitizeJson(str: String): String { |
111 | var result = "\"" | |
112 | for (i in str.indices) { | |
113 | when (val c = str[i]) { | |
114 | '\\', '"', '/' -> result += "\\$c" | |
115 | '\t' -> result += "\\t" | |
116 | '\n' -> result += "\\n" | |
117 | '\r' -> result += "\\r" | |
118 | else -> if (c < ' ' || (c in '\u0080'..'\u00bf') || (c in '\u2000'..'\u20ff')) { | |
119 | result += "\\u%04x".format(c.code) | |
120 | } else { | |
121 | result += c | |
122 | } | |
123 | } | |
124 | } | |
125 | return result + "\"" | |
126 | } | |
127 | ||
184 | 128 | private fun doProcess( |
129 | req: HttpServletRequest, | |
130 | resp: HttpServletResponse, | |
131 | mappings: Map<PathPattern, MappingMethod> | |
132 | ) { | |
133 | val session = req.session | |
134 | ||
135 | // the very first thing to do is to force UTF-8 | |
136 | req.characterEncoding = "UTF-8" | |
137 | ||
138 | // set some internal request attributes | |
139 | val fullPath = req.servletPath + Optional.ofNullable(req.pathInfo).orElse("") | |
140 | req.setAttribute(Constants.REQ_ATTR_PATH, fullPath) | |
141 | req.getHeader("Referer")?.let { | |
142 | // TODO: add a sanity check to avoid link injection | |
143 | req.setAttribute(Constants.REQ_ATTR_REFERER, it) | |
144 | } | |
145 | ||
298
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
146 | // choose the requested language as session language (if available) |
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
147 | if (session.getAttribute(Constants.SESSION_ATTR_LANGUAGE) == null) { |
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
148 | // language selection stored in cookie |
367
0a9065936aac
add "what's new" popup - resolves #670
Mike Becker <universe@uap-core.de>
parents:
358
diff
changeset
|
149 | val cookieLocale = cookieLanguage(req) |
298
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
150 | |
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
151 | // if no cookie, fall back to request locale a.k.a "Browser Language" |
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
152 | val reqLocale = cookieLocale ?: req.locale |
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
153 | |
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
154 | val availableLanguages = availableLanguages() |
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
155 | val sessionLocale = if (availableLanguages.contains(reqLocale)) reqLocale else availableLanguages.first() |
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
156 | |
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
157 | // select the language (this will also refresh the cookie max-age) |
367
0a9065936aac
add "what's new" popup - resolves #670
Mike Becker <universe@uap-core.de>
parents:
358
diff
changeset
|
158 | selectLanguage(req, resp, sessionLocale) |
298
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
159 | |
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
160 | logger.debug( |
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
161 | "Setting language for new session {0}: {1}", session.id, sessionLocale.displayLanguage |
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
162 | ) |
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
163 | } else { |
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
164 | val sessionLocale = session.getAttribute(Constants.SESSION_ATTR_LANGUAGE) as Locale |
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
165 | resp.locale = sessionLocale |
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
166 | logger.trace("Continuing session {0} with language {1}", session.id, sessionLocale) |
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
167 | } |
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
168 | |
335
1eed60b779da
change language menu to settings menu and add timezone settings - fixes #402
Mike Becker <universe@uap-core.de>
parents:
298
diff
changeset
|
169 | // determine the timezone |
1eed60b779da
change language menu to settings menu and add timezone settings - fixes #402
Mike Becker <universe@uap-core.de>
parents:
298
diff
changeset
|
170 | if (session.getAttribute(Constants.SESSION_ATTR_TIMEZONE) == null) { |
1eed60b779da
change language menu to settings menu and add timezone settings - fixes #402
Mike Becker <universe@uap-core.de>
parents:
298
diff
changeset
|
171 | // timezone selection stored in cookie |
367
0a9065936aac
add "what's new" popup - resolves #670
Mike Becker <universe@uap-core.de>
parents:
358
diff
changeset
|
172 | val cookieTimezone = cookieTimezone(req) |
335
1eed60b779da
change language menu to settings menu and add timezone settings - fixes #402
Mike Becker <universe@uap-core.de>
parents:
298
diff
changeset
|
173 | |
1eed60b779da
change language menu to settings menu and add timezone settings - fixes #402
Mike Becker <universe@uap-core.de>
parents:
298
diff
changeset
|
174 | // if no cookie, fall back to server's timezone (the browser does not transmit one) |
1eed60b779da
change language menu to settings menu and add timezone settings - fixes #402
Mike Becker <universe@uap-core.de>
parents:
298
diff
changeset
|
175 | val timezone = cookieTimezone ?: ZoneId.systemDefault() |
1eed60b779da
change language menu to settings menu and add timezone settings - fixes #402
Mike Becker <universe@uap-core.de>
parents:
298
diff
changeset
|
176 | |
367
0a9065936aac
add "what's new" popup - resolves #670
Mike Becker <universe@uap-core.de>
parents:
358
diff
changeset
|
177 | selectTimezone(req, resp, timezone) |
335
1eed60b779da
change language menu to settings menu and add timezone settings - fixes #402
Mike Becker <universe@uap-core.de>
parents:
298
diff
changeset
|
178 | logger.debug("Timezone for session {0} set to {1}", session.id, timezone) |
1eed60b779da
change language menu to settings menu and add timezone settings - fixes #402
Mike Becker <universe@uap-core.de>
parents:
298
diff
changeset
|
179 | } |
1eed60b779da
change language menu to settings menu and add timezone settings - fixes #402
Mike Becker <universe@uap-core.de>
parents:
298
diff
changeset
|
180 | |
184 | 181 | // if this is an error path, bypass the normal flow |
182 | if (fullPath.startsWith("/error/")) { | |
367
0a9065936aac
add "what's new" popup - resolves #670
Mike Becker <universe@uap-core.de>
parents:
358
diff
changeset
|
183 | val http = HttpRequest(null, req, resp) |
184 | 184 | http.styleSheets = listOf("error") |
185 | http.render("error") | |
186 | return | |
187 | } | |
188 | ||
189 | // obtain a connection and create the data access objects | |
190 | val dsp = req.servletContext.getAttribute(SC_ATTR_NAME) as DataSourceProvider | |
191 | val dialect = dsp.dialect | |
192 | val ds = dsp.dataSource | |
193 | if (ds == null) { | |
194 | resp.sendError( | |
195 | HttpServletResponse.SC_SERVICE_UNAVAILABLE, | |
196 | "JNDI DataSource lookup failed. See log for details." | |
197 | ) | |
198 | return | |
199 | } | |
200 | try { | |
201 | ds.connection.use { connection -> | |
202 | val dao = createDataAccessObject(dialect, connection) | |
203 | try { | |
204 | connection.autoCommit = false | |
205 | invokeMapping(findMapping(mappings, req), req, resp, dao) | |
206 | connection.commit() | |
207 | } catch (ex: SQLException) { | |
247 | 208 | logger.warn("Database transaction failed (Code {0}): {1}", ex.errorCode, ex.message) |
209 | logger.debug("Details: ", ex) | |
184 | 210 | resp.sendError( |
211 | HttpServletResponse.SC_INTERNAL_SERVER_ERROR, | |
212 | "Unhandled Transaction Error - Code: " + ex.errorCode | |
213 | ) | |
214 | connection.rollback() | |
215 | } | |
216 | } | |
217 | } catch (ex: SQLException) { | |
247 | 218 | logger.error("Severe Database Exception (Code {0}): {1}", ex.errorCode, ex.message) |
219 | logger.debug("Details: ", ex) | |
184 | 220 | resp.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "Database Error - Code: " + ex.errorCode) |
221 | } | |
222 | } | |
223 | ||
374
34abadbdd0e3
fix "what's new" not shown after redirects + do not show it when accessed via RSS
Mike Becker <universe@uap-core.de>
parents:
367
diff
changeset
|
224 | private fun showWhatsNewPopup(user: User?, req: HttpServletRequest, resp: HttpServletResponse, dao: DataAccessObject) { |
34abadbdd0e3
fix "what's new" not shown after redirects + do not show it when accessed via RSS
Mike Becker <universe@uap-core.de>
parents:
367
diff
changeset
|
225 | // don't show to anonymous users |
367
0a9065936aac
add "what's new" popup - resolves #670
Mike Becker <universe@uap-core.de>
parents:
358
diff
changeset
|
226 | if (user == null) return |
374
34abadbdd0e3
fix "what's new" not shown after redirects + do not show it when accessed via RSS
Mike Becker <universe@uap-core.de>
parents:
367
diff
changeset
|
227 | |
34abadbdd0e3
fix "what's new" not shown after redirects + do not show it when accessed via RSS
Mike Becker <universe@uap-core.de>
parents:
367
diff
changeset
|
228 | // don't show if we aren't going to forward to the site JSP |
34abadbdd0e3
fix "what's new" not shown after redirects + do not show it when accessed via RSS
Mike Becker <universe@uap-core.de>
parents:
367
diff
changeset
|
229 | if (req.getAttribute(Constants.REQ_ATTR_JSP) != "site") return |
34abadbdd0e3
fix "what's new" not shown after redirects + do not show it when accessed via RSS
Mike Becker <universe@uap-core.de>
parents:
367
diff
changeset
|
230 | |
34abadbdd0e3
fix "what's new" not shown after redirects + do not show it when accessed via RSS
Mike Becker <universe@uap-core.de>
parents:
367
diff
changeset
|
231 | // don't show for different sources |
34abadbdd0e3
fix "what's new" not shown after redirects + do not show it when accessed via RSS
Mike Becker <universe@uap-core.de>
parents:
367
diff
changeset
|
232 | if (listOf("rss").contains(req.getParameter("source").orEmpty())) return |
34abadbdd0e3
fix "what's new" not shown after redirects + do not show it when accessed via RSS
Mike Becker <universe@uap-core.de>
parents:
367
diff
changeset
|
233 | |
34abadbdd0e3
fix "what's new" not shown after redirects + do not show it when accessed via RSS
Mike Becker <universe@uap-core.de>
parents:
367
diff
changeset
|
234 | // show the popup and remember that we've shown it |
367
0a9065936aac
add "what's new" popup - resolves #670
Mike Becker <universe@uap-core.de>
parents:
358
diff
changeset
|
235 | logger.trace("show user with ID {0} what's new", user.id) |
0a9065936aac
add "what's new" popup - resolves #670
Mike Becker <universe@uap-core.de>
parents:
358
diff
changeset
|
236 | val userKnowsUpdatesUntil = dao.untilWhenUserKnowsUpdates(user) |
0a9065936aac
add "what's new" popup - resolves #670
Mike Becker <universe@uap-core.de>
parents:
358
diff
changeset
|
237 | if (userKnowsUpdatesUntil == null || userKnowsUpdatesUntil.before(SqlDate.valueOf(Constants.VERSION_DATE))) { |
0a9065936aac
add "what's new" popup - resolves #670
Mike Becker <universe@uap-core.de>
parents:
358
diff
changeset
|
238 | dao.updateUserKnowsUpdates(user) |
0a9065936aac
add "what's new" popup - resolves #670
Mike Becker <universe@uap-core.de>
parents:
358
diff
changeset
|
239 | req.setAttribute("showWhatsNew", true) |
0a9065936aac
add "what's new" popup - resolves #670
Mike Becker <universe@uap-core.de>
parents:
358
diff
changeset
|
240 | } |
0a9065936aac
add "what's new" popup - resolves #670
Mike Becker <universe@uap-core.de>
parents:
358
diff
changeset
|
241 | } |
0a9065936aac
add "what's new" popup - resolves #670
Mike Becker <universe@uap-core.de>
parents:
358
diff
changeset
|
242 | |
184 | 243 | override fun doGet(req: HttpServletRequest, resp: HttpServletResponse) { |
244 | doProcess(req, resp, getMappings) | |
245 | } | |
246 | ||
247 | override fun doPost(req: HttpServletRequest, resp: HttpServletResponse) { | |
248 | doProcess(req, resp, postMappings) | |
249 | } | |
250 | ||
251 | protected fun availableLanguages(): List<Locale> { | |
252 | val langTags = servletContext.getInitParameter(Constants.CTX_ATTR_LANGUAGES)?.split(",")?.map(String::trim) ?: emptyList() | |
253 | val locales = langTags.map(Locale::forLanguageTag).filter { it.language.isNotEmpty() } | |
208
785820da6485
fixes response locale not set for new sessions
Mike Becker <universe@uap-core.de>
parents:
184
diff
changeset
|
254 | return locales.ifEmpty { listOf(Locale.ENGLISH) } |
184 | 255 | } |
256 | ||
367
0a9065936aac
add "what's new" popup - resolves #670
Mike Becker <universe@uap-core.de>
parents:
358
diff
changeset
|
257 | private fun cookieLanguage(request: HttpServletRequest): Locale? = |
0a9065936aac
add "what's new" popup - resolves #670
Mike Becker <universe@uap-core.de>
parents:
358
diff
changeset
|
258 | request.cookies?.firstOrNull { c -> c.name == LANGUAGE_COOKIE_NAME } |
298
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
259 | ?.runCatching {Locale.forLanguageTag(this.value)}?.getOrNull() |
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
260 | |
335
1eed60b779da
change language menu to settings menu and add timezone settings - fixes #402
Mike Becker <universe@uap-core.de>
parents:
298
diff
changeset
|
261 | protected fun sessionLanguage(http: HttpRequest) = http.session.getAttribute(Constants.SESSION_ATTR_LANGUAGE) as Locale |
1eed60b779da
change language menu to settings menu and add timezone settings - fixes #402
Mike Becker <universe@uap-core.de>
parents:
298
diff
changeset
|
262 | |
367
0a9065936aac
add "what's new" popup - resolves #670
Mike Becker <universe@uap-core.de>
parents:
358
diff
changeset
|
263 | private fun cookieTimezone(request: HttpServletRequest): ZoneId? = |
0a9065936aac
add "what's new" popup - resolves #670
Mike Becker <universe@uap-core.de>
parents:
358
diff
changeset
|
264 | request.cookies?.firstOrNull { c -> c.name == TIMEZONE_COOKIE_NAME } |
335
1eed60b779da
change language menu to settings menu and add timezone settings - fixes #402
Mike Becker <universe@uap-core.de>
parents:
298
diff
changeset
|
265 | ?.runCatching { ZoneId.of(this.value)}?.getOrNull() |
1eed60b779da
change language menu to settings menu and add timezone settings - fixes #402
Mike Becker <universe@uap-core.de>
parents:
298
diff
changeset
|
266 | |
1eed60b779da
change language menu to settings menu and add timezone settings - fixes #402
Mike Becker <universe@uap-core.de>
parents:
298
diff
changeset
|
267 | protected fun sessionTimezone(http: HttpRequest) = http.session.getAttribute(Constants.SESSION_ATTR_TIMEZONE) as String |
1eed60b779da
change language menu to settings menu and add timezone settings - fixes #402
Mike Becker <universe@uap-core.de>
parents:
298
diff
changeset
|
268 | |
1eed60b779da
change language menu to settings menu and add timezone settings - fixes #402
Mike Becker <universe@uap-core.de>
parents:
298
diff
changeset
|
269 | protected fun selectTimezone(http: HttpRequest, zoneId: ZoneId) { |
367
0a9065936aac
add "what's new" popup - resolves #670
Mike Becker <universe@uap-core.de>
parents:
358
diff
changeset
|
270 | selectTimezone(http.request, http.response, zoneId) |
0a9065936aac
add "what's new" popup - resolves #670
Mike Becker <universe@uap-core.de>
parents:
358
diff
changeset
|
271 | } |
0a9065936aac
add "what's new" popup - resolves #670
Mike Becker <universe@uap-core.de>
parents:
358
diff
changeset
|
272 | |
0a9065936aac
add "what's new" popup - resolves #670
Mike Becker <universe@uap-core.de>
parents:
358
diff
changeset
|
273 | private fun selectTimezone(request: HttpServletRequest, response: HttpServletResponse, zoneId: ZoneId) { |
0a9065936aac
add "what's new" popup - resolves #670
Mike Becker <universe@uap-core.de>
parents:
358
diff
changeset
|
274 | request.session.setAttribute(Constants.SESSION_ATTR_TIMEZONE, zoneId.id) |
335
1eed60b779da
change language menu to settings menu and add timezone settings - fixes #402
Mike Becker <universe@uap-core.de>
parents:
298
diff
changeset
|
275 | val cookie = Cookie(TIMEZONE_COOKIE_NAME, zoneId.id) |
1eed60b779da
change language menu to settings menu and add timezone settings - fixes #402
Mike Becker <universe@uap-core.de>
parents:
298
diff
changeset
|
276 | cookie.isHttpOnly = true |
367
0a9065936aac
add "what's new" popup - resolves #670
Mike Becker <universe@uap-core.de>
parents:
358
diff
changeset
|
277 | cookie.path = request.contextPath |
335
1eed60b779da
change language menu to settings menu and add timezone settings - fixes #402
Mike Becker <universe@uap-core.de>
parents:
298
diff
changeset
|
278 | cookie.maxAge = COOKIE_MAX_AGE |
367
0a9065936aac
add "what's new" popup - resolves #670
Mike Becker <universe@uap-core.de>
parents:
358
diff
changeset
|
279 | response.addCookie(cookie) |
335
1eed60b779da
change language menu to settings menu and add timezone settings - fixes #402
Mike Becker <universe@uap-core.de>
parents:
298
diff
changeset
|
280 | } |
1eed60b779da
change language menu to settings menu and add timezone settings - fixes #402
Mike Becker <universe@uap-core.de>
parents:
298
diff
changeset
|
281 | |
298
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
282 | protected fun selectLanguage(http: HttpRequest, locale: Locale) { |
367
0a9065936aac
add "what's new" popup - resolves #670
Mike Becker <universe@uap-core.de>
parents:
358
diff
changeset
|
283 | selectLanguage(http.request, http.response, locale) |
0a9065936aac
add "what's new" popup - resolves #670
Mike Becker <universe@uap-core.de>
parents:
358
diff
changeset
|
284 | } |
0a9065936aac
add "what's new" popup - resolves #670
Mike Becker <universe@uap-core.de>
parents:
358
diff
changeset
|
285 | |
0a9065936aac
add "what's new" popup - resolves #670
Mike Becker <universe@uap-core.de>
parents:
358
diff
changeset
|
286 | private fun selectLanguage(request: HttpServletRequest, response: HttpServletResponse, locale: Locale) { |
0a9065936aac
add "what's new" popup - resolves #670
Mike Becker <universe@uap-core.de>
parents:
358
diff
changeset
|
287 | response.locale = locale |
0a9065936aac
add "what's new" popup - resolves #670
Mike Becker <universe@uap-core.de>
parents:
358
diff
changeset
|
288 | request.session.setAttribute(Constants.SESSION_ATTR_LANGUAGE, locale) |
298
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
289 | // delete cookie if language selection matches request locale, otherwise set cookie |
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
290 | val cookie = Cookie(LANGUAGE_COOKIE_NAME, "") |
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
291 | cookie.isHttpOnly = true |
367
0a9065936aac
add "what's new" popup - resolves #670
Mike Becker <universe@uap-core.de>
parents:
358
diff
changeset
|
292 | cookie.path = request.contextPath |
0a9065936aac
add "what's new" popup - resolves #670
Mike Becker <universe@uap-core.de>
parents:
358
diff
changeset
|
293 | if (request.locale.language == locale.language) { |
298
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
294 | cookie.maxAge = 0 |
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
295 | } else { |
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
296 | cookie.value = locale.language |
335
1eed60b779da
change language menu to settings menu and add timezone settings - fixes #402
Mike Becker <universe@uap-core.de>
parents:
298
diff
changeset
|
297 | cookie.maxAge = COOKIE_MAX_AGE |
298
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
298 | } |
367
0a9065936aac
add "what's new" popup - resolves #670
Mike Becker <universe@uap-core.de>
parents:
358
diff
changeset
|
299 | response.addCookie(cookie) |
298
1275eb652008
add language selection cookie - fixes #352
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
300 | } |
184 | 301 | } |