implemented more SAML settings

Author: car031

logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/widgets/preview/PreviewPopup.java

@@ -80,7 +80,7 @@ public PreviewPopup(GUIDocument[] docs, int index) {
 		prev.setShowRollOver(true);
 		prev.setShowDisabled(true);
 		prev.setShowDown(true);
-		prev.setIcon("[SKIN]/headerIcons/arrow_left.gif");
+		prev.setIcon("[SKIN]/headerIcons/arrow_left.png");
 		prev.addClickHandler(event -> {
 			if (currentIndex <= 0)
 				currentIndex = PreviewPopup.this.docs.length - 1;
@@ -95,7 +95,7 @@ public PreviewPopup(GUIDocument[] docs, int index) {
 		next.setShowRollOver(true);
 		next.setShowDisabled(true);
 		next.setShowDown(true);
-		next.setIcon("[SKIN]/headerIcons/arrow_right.gif");
+		next.setIcon("[SKIN]/headerIcons/arrow_right.png");
 		next.addClickHandler(event -> {
 				if (currentIndex >= PreviewPopup.this.docs.length)
 					currentIndex = 0;

logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/document/reading/ReadingRequestDialog.java

@@ -5,6 +5,7 @@
 import com.logicaldoc.gui.common.client.log.GuiLog;
 import com.logicaldoc.gui.common.client.util.ItemFactory;
 import com.logicaldoc.gui.common.client.util.LD;
+import com.logicaldoc.gui.common.client.widgets.GroupSelectorCombo;
 import com.logicaldoc.gui.common.client.widgets.StickyWindow;
 import com.logicaldoc.gui.common.client.widgets.UserSelectorCombo;
 import com.logicaldoc.gui.frontend.client.services.ReadingRequestService;
@@ -28,6 +29,8 @@ public class ReadingRequestDialog extends StickyWindow {
 
 	private UserSelectorCombo usersItem;
 
+	private GroupSelectorCombo groupsItem;
+
 	public ReadingRequestDialog(Long[] docIds) {
 		super(I18N.message("requesttoconfirmreading"));
 		setCanDragResize(true);
@@ -43,7 +46,8 @@ public ReadingRequestDialog(Long[] docIds) {
 		form.setHeight100();
 
 		usersItem = new UserSelectorCombo("users", "users", null, true, true);
-		usersItem.setRequired(true);
+
+		groupsItem = new GroupSelectorCombo("groups", "groups");
 
 		TextAreaItem message = ItemFactory.newTextAreaItem("message", null);
 		message.setMinHeight(80);
@@ -52,7 +56,7 @@ public ReadingRequestDialog(Long[] docIds) {
 		CheckboxItem alertConfirmation = ItemFactory.newCheckbox("notifyreadingconfirmation");
 		alertConfirmation.setValue(true);
 
-		form.setItems(usersItem, message, alertConfirmation);
+		form.setItems(usersItem, groupsItem, message, alertConfirmation);
 
 		addItem(form);
 		addItem(prepareButtons());
@@ -64,6 +68,7 @@ protected ToolStrip prepareButtons() {
 			if (form.validate()) {
 				LD.contactingServer();
 				ReadingRequestService.Instance.get().askReadingConfirmation(docIds, usersItem.getUserIds(),
+						groupsItem.getGroupIds(),
 						Boolean.parseBoolean(form.getValueAsString("notifyreadingconfirmation")),
 						form.getValueAsString("message"), new AsyncCallback<Void>() {
 

logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/security/saml/GUISamlSettings.java

@@ -38,6 +38,8 @@ public class GUISamlSettings implements Serializable {
 
 	private String group = "group";
 
+	private boolean keepLocalMemberships = true;
+
 	public boolean isEnabled() {
 		return enabled;
 	}
@@ -141,4 +143,12 @@ public String getGroup() {
 	public void setGroup(String group) {
 		this.group = group;
 	}
+
+	public boolean isKeepLocalMemberships() {
+		return keepLocalMemberships;
+	}
+
+	public void setKeepLocalMemberships(boolean keepLocalMemberships) {
+		this.keepLocalMemberships = keepLocalMemberships;
+	}
 }

logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/security/saml/SamlPanel.java

@@ -57,6 +57,8 @@ public class SamlPanel extends VLayout {
 
 	private static final String NAMEID_ENCRYPTED = "nameidencrypted";
 
+	private static final String KEEPMEMBERSHIP = "keepmembership";
+
 	public SamlPanel() {
 		setWidth100();
 		setMembersMargin(5);
@@ -106,6 +108,10 @@ private void initGUI(GUISamlSettings settings) {
 		TextItem groups = ItemFactory.newTextItem(GROUPS, GROUPS, settings.getGroup());
 		groups.setWrapTitle(false);
 
+		RadioGroupItem keepMembership = ItemFactory.newBooleanSelector(KEEPMEMBERSHIP, "keepmembershiplocalgroups");
+		keepMembership.setValue(settings.isKeepLocalMemberships() ? "yes" : "no");
+		keepMembership.setRequired(true);
+
 		RadioGroupItem authnRequestSigned = ItemFactory.newBooleanSelector(AUTHNREQUEST_SIGNED);
 		authnRequestSigned.setWrapTitle(true);
 		authnRequestSigned.setRequired(true);
@@ -183,11 +189,11 @@ private void initGUI(GUISamlSettings settings) {
 		attributeMappingsForm.setValuesManager(vm);
 		attributeMappingsForm.setIsGroup(true);
 		attributeMappingsForm.setGroupTitle(I18N.message("attrtibutemappings"));
-		attributeMappingsForm.setTitleOrientation(TitleOrientation.LEFT);
+		attributeMappingsForm.setTitleOrientation(TitleOrientation.TOP);
 		attributeMappingsForm.setAlign(Alignment.LEFT);
 		attributeMappingsForm.setHeight(1);
 		attributeMappingsForm.setWidth(590);
-		attributeMappingsForm.setFields(username, firstName, lastName, email, groups);
+		attributeMappingsForm.setFields(username, firstName, lastName, email, groups, keepMembership);
 
 		VLayout forms = new VLayout();
 		forms.setMembersMargin(10);
@@ -224,6 +230,7 @@ private IButton prepareSaveButton(ValuesManager form) {
 			settings.setAuthnRequestSigned("yes".equals(form.getValue(AUTHNREQUEST_SIGNED)));
 			settings.setWantAssertionsEncrypted("yes".equals(form.getValue(ASSERTIONS_ENCRYPTED)));
 			settings.setWantNameIdEncrypted("yes".equals(form.getValue(NAMEID_ENCRYPTED)));
+			settings.setKeepLocalMemberships("yes".equals(form.getValue(KEEPMEMBERSHIP)));
 			settings.setCertificate(form.getValueAsString(CERTIFICATE));
 			settings.setPrivateKey(form.getValueAsString(PRIVATEKEY));
 			settings.setIdpMetadata(form.getValueAsString(IDP_METADATA));

logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/services/ReadingRequestService.java

@@ -22,13 +22,14 @@ public interface ReadingRequestService extends RemoteService {
 	 * Asks some users to confirm the reading of a set of documents
 	 * 
 	 * @param docIds identifiers of the documents
-	 * @param recipientIds identifiers of the recipients
+	 * @param userIds identifiers of the recipients
+	 * @param groupIds identifiers of the groups
 	 * @param comment an optional message to include in the notification
 	 * @param alertConfirmation if the requestor must be notified on reading confirmation
 	 * 
 	 * @throws ServerException an error happened in the server application
 	 */
-	public void askReadingConfirmation(Long[] docIds, long[] recipientIds, boolean alertConfirmation, String comment) throws ServerException;
+	public void askReadingConfirmation(Long[] docIds, long[] userIds, long[] groupIds, boolean alertConfirmation, String comment) throws ServerException;
 
 	/**
 	 * Confirms the read completion of a given file version

logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/services/ReadingRequestServiceAsync.java

@@ -5,8 +5,8 @@
 
 public interface ReadingRequestServiceAsync {
 
-	void askReadingConfirmation(Long[] docIds, long[] recipientIds, boolean alertConfirmation, String comment,
-			AsyncCallback<Void> callback);
+	void askReadingConfirmation(Long[] docIds, long[] userIds, long[] groupIds, boolean alertConfirmation,
+			String comment, AsyncCallback<Void> callback);
 
 	void confirmReadings(long[] readingIds, String version, AsyncCallback<Void> callback);
 

logicaldoc-webapp/src/main/java/com/logicaldoc/web/service/SettingServiceImpl.java

@@ -191,7 +191,7 @@ public GUIParameter[] loadSettings() throws ServerException {
 					|| name.startsWith("cas.") || name.startsWith("cache.") || name.startsWith("jdbc.")
 					|| name.startsWith("comparator.") || name.contains(".via.") || name.contains(".downloadticket.")
 					|| name.startsWith("zonalocr.") || name.endsWith(CHARSET) || name.startsWith("policy.")
-					|| name.startsWith("cookies."))
+					|| name.startsWith("cookies.") || name.startsWith("saml."))
 				continue;
 
 			sortedSet.add(key.toString());

logicaldoc-webapp/src/main/resources/context.properties

@@ -858,3 +858,17 @@ policy.google = https://www.logicaldoc.com/google-integration-privacy-policy
 parse.email.includes=
 parse.email.excludes=*
 
+saml.enabled = true
+saml.sp.entityid =
+saml.sp.certificate =
+saml.sp.privatekey = MIIEuwIBADANBgkqhkiG9w0BAQEFAASCBKUwggShAgEAAoIBAQC88Ne1VZJgbtmU3IRIhMJH/uNYbhj5tZ2ZaqDVRwtPR8Ou5KLQmy4lSOw4kgUYwOL320BUW2M+BjdwFrxJf1B+7H2sFJtEdB4XBMX9zAvi4ZnBzkqsXMJK+shs24oXczpPpSyutXF0JrvrSWVCUWU6b4udP0vkxh/VJDH1eqorEG4iSyn+TkZ0GDChfLtlvYM1VUSxQVwnfGAJ68XUNmSI3pa/0R28KVUZ8CimFQDQ15AYHNavMEuz4JjCkmHI2Sr4kjc3p5EpxtkSKpjuN5BB0xE3c8ccCOsNoVoMvK09qL/Lz/9wsCzt/Fi3sNufg/5MUJ4///Rin01nz7JrByhnAgMBAAECgf9Zq/S0m2hdXD7n58DgqiGLCe3cimRQH2Is7e5nStCTT/wPhXPAjeXYzENQlfzVQrZ17Bkb8EOprEmjaSbzuvj5RERg52bJllKxmhJd4fnCNFBFKyNFqsCL1XpKL+faOVXzdvE9+d9ewQNvJ+ZnEzp4AXjBqMjcSyvQfN05JH6e8NrhMToUQde2BmypEQ5HrsKqOxbPZPQz1sWM9sQcEZGzG+/cGqdeQDGf6LZGv7wXQ3cF1NhNHDXYHWM9+efnR7AUvtoZV2HjiGr+6yRchKvokvkF2SM1j4PDes+4W/iaZE1tDDQQp4jy944upX8J5Vuzdg8ckIf1SKSV6vHQnGECgYEA+b5EuKKceaEpaBAmeion/xQTtheah2GbrC38N7VrXCtUDPXIVol0kXnI8MnnwzjEQcSxBoUsH05iilKw75urD+qVxfHcumcmY+Wz/CXOdHkvvx9nnpZpK20967QjjOjLyDTBB4u/cHmWiFPn2Z7JeovC/lWW2SoauD0kdosbV2ECgYEAwayd7AupiXeOoTKKeWQrBxWvo5V4+XD7GCyPBQKybO+aDYq85c7TL1hMb04JZfbk1Z+zutCQQ6tkSK5S6XmxmcRhuC9C+hgjf6X1y5m4DTBqrpjzlwSuBpTPyIaXq3j4jp/NYQGvNWOJn51NX1/FRFaHzyt3jgESl4yEMNl7vMcCgYBA36v6SkNbVQHshkV4dnrtR8nXA0qg4DoP/+IElpvM1XR/6VihIhOltnz8D3akv5o7e1yA1RchCruOMuzDUSyeddFyGeG8ig7u5Dxcw3VdzB0bCI1iJLAtF7N+Bs01TUOiPhHmY+bW0L7JqwIPBbBQpP2CE7mbr9RBB6DxKjFwAQKBgHjKWewgEerkoBY1WVwAdz2B7vtNfBfGuTQIhmKPngyHG0Oa5dlGNzxuC63Xs9DePTZm1keLUI6D1JXn81oeRgArFO80uscUSv+P2E7VXo8LRV4Dktj7WDZOlZDxMKMHXa5GSGdaD5ZysCDWkK0NJBFNDoLND1GHpbrTLpbw7VV9AoGBANLD5hcRbA7rHdmVedGCMRuFFZ+GJ/efNNd0yvpq3ocFxJXeye8PCWp7cramQOfpcEbQCpsUXqbvliNFrMOt8qzAD+zkri+Z+a593tnkjyjD5Bp4TbYiROY/wuB9ZGhonzE6+RmbEaaLTblBdqrGSBG6L+NMGP8TNdGdyTqP64Ni
+saml.security.authnrequest_signed = false
+saml.security.want_assertions_encrypted = false
+saml.security.want_nameid_encrypted = false
+saml.idp.metadata =
+saml.attribute.username = username
+saml.attribute.firstname = firstName
+saml.attribute.lastname = lastName
+saml.attribute.email = email
+saml.attribute.group = group
+saml.attribute.group.keeplocal = true