Skip to content
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

Udl #13

Open
wants to merge 8 commits into
base: 7.10
Choose a base branch
from
Open

Udl #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
83446d7
first test
zzOzz Dec 7, 2017
74c65c7
refactor all
zzOzz Dec 12, 2017
d179913
add normal invitation
zzOzz Dec 15, 2017
62977cc
remove nuxeo code
zzOzz Dec 15, 2017
1088deb
Merge branch '7.10' into udl
zzOzz Dec 18, 2017
3528387
Merge branch '7.10' into udl
zzOzz Dec 18, 2017
ce53d69
changes for MR
zzOzz Dec 18, 2017
a2d7acd
changes for MR
zzOzz Dec 18, 2017
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
85 changes: 73 additions & 12 deletions src/main/java/org/nuxeo/shibboleth/invitation/ShibboInviteObject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,24 @@
package org.nuxeo.shibboleth.invitation;

import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.util.HashMap;
import java.util.Map;

import javax.ws.rs.FormParam;
import javax.ws.rs.GET;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.*;
Copy link
Contributor

Choose a reason for hiding this comment

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

Wildcard imports shouldn't be used.

import javax.ws.rs.core.Context;

import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.nuxeo.ecm.core.api.*;
import org.nuxeo.ecm.core.api.repository.RepositoryManager;
import org.nuxeo.ecm.core.api.security.ACE;
import org.nuxeo.ecm.core.api.security.ACL;
import org.nuxeo.ecm.core.api.security.ACP;
import org.nuxeo.ecm.platform.shibboleth.service.ShibbolethAuthenticationService;
import org.nuxeo.ecm.platform.usermanager.UserManager;
import org.nuxeo.ecm.platform.web.common.vh.VirtualHostHelper;
import org.nuxeo.ecm.user.invite.AlreadyProcessedRegistrationException;
import org.nuxeo.ecm.user.invite.DefaultInvitationUserFactory;
Expand All @@ -45,8 +51,62 @@
@WebObject(type = "shibboInvite")
@Produces("text/html;charset=UTF-8")
public class ShibboInviteObject extends ModuleRoot {
public static final String DEFAULT_REGISTRATION = "default_registration";
private static final Log log = LogFactory.getLog(ShibboInviteObject.class);

private DocumentModel findUser(String field, String userName) {
log.trace("findUser");
Map<String, Serializable> query = new HashMap<>();
query.put(field, userName);
DocumentModelList users = Framework.getLocalService(UserManager.class).searchUsers(query, null);

if (users.isEmpty()) {
return null;
}
return users.get(0);
}

@GET
@Path("shibboleth")
public Object mapShibbolethUser(@Context HttpServletRequest httpServletRequest, @QueryParam("RequestId") final String requestID) {
log.trace("requestID:" + requestID);
log.trace("principal:" + getContext().getUserSession().getPrincipal());
final String userID = Framework.getService(ShibbolethAuthenticationService.class).getUserID(httpServletRequest);
log.trace("userID:" + userID);
log.trace("getUserInfoUsernameField:" +Framework.getLocalService(UserRegistrationService.class).getConfiguration(DEFAULT_REGISTRATION).getUserInfoUsernameField());
new UnrestrictedSessionRunner(Framework.getService(RepositoryManager.class).getDefaultRepositoryName()) {
@Override
public void run() {
DocumentModel doc = session.getDocument(new IdRef(requestID));
// "userinfo:login"
doc.setPropertyValue("userinfo:login", userID);
log.trace("groups:" + doc.getPropertyValue("userinfo:groups"));
session.saveDocument(doc);
DocumentModel target = session.getDocument(new IdRef(
(String) doc.getPropertyValue("docinfo:documentId")));
NuxeoPrincipal targetPrincipal = Framework.getLocalService(UserManager.class).getPrincipal(userID);
ACP acp = target.getACP();
Map<String, Serializable> contextData = new HashMap<>();
contextData.put("notify", true);
contextData.put("comment", doc.getPropertyValue("registration:comment"));
acp.addACE(ACL.LOCAL_ACL,
ACE.builder(targetPrincipal.getName(), (String) doc.getPropertyValue("docinfo:permission"))
.creator((String) doc.getPropertyValue("docinfo:creator"))
.contextData(contextData)
.build());
target.setACP(acp, true);
java.util.List<String> userGroups = targetPrincipal.getGroups();
userGroups.addAll((java.util.List<String>)doc.getPropertyValue("userinfo:groups"));
targetPrincipal.setGroups(userGroups);
Framework.getLocalService(UserManager.class).updateUser(targetPrincipal.getModel());
session.saveDocument(target);

}
}.runUnrestricted();
return getView("UserCreated").arg("redirectUrl", "/");
}


@POST
@Path("validate")
public Object validateTrialForm(@FormParam("isShibbo") boolean isShibbo) {
Expand Down Expand Up @@ -86,29 +146,30 @@ public Object validateTrialForm(@FormParam("isShibbo") boolean isShibbo) {
ctx.getMessage("label.registerForm.validation.passwordvalidation"), formData);
}
}
Map<String, Serializable> registrationData;
Map<String, Serializable> registrationData = null;
try {
Map<String, Serializable> additionalInfo = buildAdditionalInfos();
// Add the entered password to the document model
additionalInfo.put(DefaultInvitationUserFactory.PASSWORD_KEY, password);
// Validate the creation of the user
registrationData = usr.validateRegistration(requestId, additionalInfo);
if(!isShibbo) {
registrationData = usr.validateRegistration(requestId, additionalInfo);
log.info("registrate user with normal login");
}
} catch (AlreadyProcessedRegistrationException ape) {
log.info("Try to validate an already processed registration");
return getView("ValidationErrorTemplate").arg("exceptionMsg",
ctx.getMessage("label.error.requestAlreadyProcessed"));
} catch (UserRegistrationException ue) {
log.warn("Unable to validate registration request", ue);
return getView("ValidationErrorTemplate").arg("exceptionMsg",
ctx.getMessage("label.errror.requestNotAccepted"));
ctx.getMessage("label.error.requestNotAccepted"));
}
// User redirected to the logout page after validating the password
String webappName = VirtualHostHelper.getWebAppName(getContext().getRequest());
String redirectUrl = "/" + webappName + "/logout";
if (isShibbo) {
return getView("UserCreated").arg("data", registrationData)
.arg("redirectUrl", "/nuxeo/site/shibboleth?requestedUrl=")
.arg("isShibbo", isShibbo);
redirectUrl = "/nuxeo/site/shibboInvite/shibboleth?RequestId="+requestId;
}
return getView("UserCreated").arg("redirectUrl", redirectUrl)
.arg("data", registrationData)
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/org/nuxeo/shibboleth/invitation/ShibbolethUserInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@

/**
* @since 7.4
* @deprecated
*/
@Deprecated
public class ShibbolethUserInfo extends UserIdentificationInfo {

private static final long serialVersionUID = 6894397878763275157L;
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/org/nuxeo/shibboleth/invitation/ShibbolethUserMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import java.util.Map;

import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.BiMap;
import org.nuxeo.ecm.core.api.DocumentModel;
import org.nuxeo.ecm.core.api.DocumentModelList;
Expand All @@ -49,7 +48,9 @@
* User mapper for handling user post creation when authenticating with Shibboleth (by invitation)
*
* @since 7.4
* @deprecated
*/
@Deprecated
public class ShibbolethUserMapper implements UserMapper {

private static final Logger log = LoggerFactory.getLogger(ShibbolethUserMapper.class);
Expand Down
13 changes: 1 addition & 12 deletions src/main/resources/OSGI-INF/authentication-contrib.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
</urlPatterns>

<replacementChain>
<plugin>FORM_AUTH</plugin>
<plugin>SHIB_AUTH</plugin>
</replacementChain>
</specificAuthenticationChain>
Expand All @@ -32,16 +33,4 @@
</authenticationChain>
</extension>

<extension target="org.nuxeo.usermapper.service.UserMapperComponent"
point="mapper">

<documentation>
Contribute the default usermapper for shibboleth.
</documentation>

<mapper name="shibboleth" class="org.nuxeo.shibboleth.invitation.ShibbolethUserMapper">
</mapper>

</extension>

</component>