Skip to content

BROOKLYN-323: Use proper WWW-Authorization header in karaf #578

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
asfgit merged 1 commit into from
Mar 6, 2017
Merged

BROOKLYN-323: Use proper WWW-Authorization header in karaf #578

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
7 changes: 7 additions & 0 deletions rest/rest-api/src/main/java/org/apache/brooklyn/rest/api/LogoutApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,17 @@ public interface LogoutApi {
})
Response logout();


@POST
@Path("/unauthorize")
@ApiOperation(value = "Return UNAUTHORIZED 401 response")
Response unAuthorize();

@POST
@Path("/{user}")
@ApiOperation(value = "Logout and clean session if matching user logged")
Response logoutUser(
@ApiParam(value = "User to log out", required = true)
@PathParam("user") final String user);

}
7 changes: 7 additions & 0 deletions rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/LogoutResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,13 @@ public Response logout() {
return Response.temporaryRedirect(dest).build();
}

@Override
public Response unAuthorize() {
return Response.status(Status.UNAUTHORIZED)
.header(HttpHeaders.WWW_AUTHENTICATE, BASIC_REALM_WEBCONSOLE)
.build();
}

@Override
public Response logoutUser(String user) {
// Will work when switching users, but will keep re-authenticating if user types in same user name.
Expand Down
1 change: 1 addition & 0 deletions rest/rest-resources/src/main/resources/OSGI-INF/blueprint/service.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ limitations under the License.
<bean class="org.apache.brooklyn.rest.util.FormMapProvider"/>
<bean class="org.apache.cxf.jaxrs.security.JAASAuthenticationFilter">
<property name="contextName" value="webconsole"/>
<property name="realmName" value="webconsole"/>
Copy link
Copy Markdown
Contributor Author

@bostko bostko Mar 2, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This sets proper WWW-Authorization: Basic realm="something"

</bean>
<bean class="org.apache.brooklyn.rest.util.ManagementContextProvider">
<argument ref="localManagementContext"/>
Expand Down