Skip to content

Add context path to the redirect URL in saml_login.jsp #1

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
max-allan-surevine wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add context path to the redirect URL in saml_login.jsp #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d7ad2f5
Add context path to the redirect URL in saml_login.jsp
Jul 31, 2018
99a1958
Don't add users to groups unless they're in Surevine
Feb 15, 2019
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
19 changes: 10 additions & 9 deletions src/com/lastpass/confluence/SAMLAuthenticator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,16 +199,17 @@ public Principal getUser(HttpServletRequest request,
logger.error("Unable to create new user: " + username);
return null;
}

try {
Group group = userAccessor.getGroup(UserAccessor.GROUP_CONFLUENCE_USERS);
if (group != null) {
GroupManager groupManager = (GroupManager)
ContainerManager.getComponent("groupManager");
groupManager.addMembership(group, user);
if (! email.endsWith('@surevine.com') ) {
try {
Group group = userAccessor.getGroup(UserAccessor.GROUP_CONFLUENCE_USERS);
if (group != null) {
GroupManager groupManager = (GroupManager)
ContainerManager.getComponent("groupManager");
groupManager.addMembership(group, user);
}
} catch (EntityException e) {
logger.error("Unable to add new user to group, continuing...");
}
} catch (EntityException e) {
logger.error("Unable to add new user to group, continuing...");
}
}

Expand Down
3 changes: 2 additions & 1 deletion web/saml_login.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,15 @@
--
--%>
<%@ page import="com.lastpass.confluence.SAMLAuthenticator" %>
<% String context = request.getContextPath(); %>
<%
// This page is accessed to initiate SAML login when getUser() in the
// authenticator returns null and there is no SAMLResponse being processed.
// Confluence will go here when we click on a login link (based on seraph config).
//
// We generate an authnrequest and then redirect to the IdP.
try {
String url = new SAMLAuthenticator().getRedirectUrl(request.getParameter("os_destination"));
String url = new SAMLAuthenticator().getRedirectUrl(context + request.getParameter("os_destination"));
response.sendRedirect(response.encodeRedirectURL(url));
} catch (Throwable t) {
out.println("Could not initialize Confluence SAML plugin: " + t);
Expand Down