Skip to content

Redirect location port from request #175

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

Open
ajtucker wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Redirect location port from request #175

Show file tree
Hide file tree
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
10 changes: 9 additions & 1 deletion src/main/java/com/epimorphics/registry/webapi/Login.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,15 @@ public Response getLogout() {
* Generate an absolute URL for the given registry-relative path (which should start with /).
*/
protected String fullURLForPath(String path) {
return String.format("%s://%s%s%s", request.getScheme(), request.getServerName(), Registry.get().getRootPath(), path);
return String.format("%s://%s%s%s%s",
request.getScheme(),
request.getServerName(),
("http".equalsIgnoreCase(request.getScheme()) && request.getServerPort() == 80) ? "" : (
("https".equalsIgnoreCase(request.getScheme()) && request.getServerPort() == 443) ? "" :
String.format(":%d", request.getServerPort())
),
Registry.get().getRootPath(),
path);
}

@Path("/pwlogin")
Expand Down
7 changes: 4 additions & 3 deletions src/test/java/com/epimorphics/registry/webapi/TestSecurity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,10 @@ protected void checkLoginLogout() {
String user = c.target(BASE_URL + "system/security/username").request().get(String.class);
assertEquals("Alice", user);

c.target(BASE_URL + "system/security/logout").request().post(null);
Response response = c.target(BASE_URL + "system/security/username").request().get();
assertTrue(response.getStatus() >= 400);
Response logoutResponse = c.target(BASE_URL + "system/security/logout").request().post(null);
assertEquals(BASE_URL, logoutResponse.getLocation().toString());
Response userResponse = c.target(BASE_URL + "system/security/username").request().get();
assertTrue(userResponse.getStatus() >= 400);
}

/**
Expand Down