这是indexloc提供的服务，不要输入任何密码
Skip to content

[pull] master from openmrs:master #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 11, 2024
Merged

[pull] master from openmrs:master #15

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions omod/src/main/java/org/openmrs/module/web/filter/ForcePasswordChangeFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ public void destroy() {
*/
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException,
ServletException {
String requestURI = ((HttpServletRequest) request).getRequestURI();
HttpServletRequest httpRequest = (HttpServletRequest) request;
String requestURI = httpRequest.getRequestURI().substring(httpRequest.getContextPath().length());

if (Context.isAuthenticated()
&& new UserProperties(Context.getAuthenticatedUser().getUserProperties()).isSupposedToChangePassword()
Expand All @@ -65,10 +66,13 @@ && shouldNotAllowAccessToUrl(requestURI)) {
* Method to check if the request url is an excluded url.
*
* @param requestURI
* @param excludeURL
* @return
*/
private boolean shouldNotAllowAccessToUrl(String requestURI) {
// /ws is reserved
if (requestURI.startsWith("/ws")) {
return false;
}

for (String url : excludedURLs) {
if (requestURI.endsWith(url)) {
Expand Down
Loading