Merge branch 'develop' into stable (ceb8d2c6) · Commits · Inteligr8 / asie-platform-module

shared/src/main/java/com/inteligr8/alfresco/asie/model/PersistedNode.java

0 → 100644

+36 −0

Original line number	Diff line number	Diff line
		package com.inteligr8.alfresco.asie.model;

		import java.io.Serializable;

		public class PersistedNode implements Serializable {

		private static final long serialVersionUID = 4105196543023419818L;

		private final SolrHost node;
		private final long persistMillis;
		private long expireTimeMillis;

		public PersistedNode(SolrHost node, int persistMinutes) {
		this.node = node;
		this.persistMillis = persistMinutes * 60L * 1000L;
		this.reset();
		}

		public void reset() {
		this.expireTimeMillis = System.currentTimeMillis() + this.persistMillis;
		}

		public boolean isExpired() {
		return this.expireTimeMillis < System.currentTimeMillis();
		}

		public SolrHost getNode() {
		return this.node;
		}

		@Override
		public String toString() {
		return "node: " + this.node + "; expires in: " + (System.currentTimeMillis() - this.expireTimeMillis) + " ms";
		}

		}

shared/src/main/java/com/inteligr8/alfresco/asie/rest/AbstractAsieWebScript.java

+2 −25

Original line number	Diff line number	Diff line
		package com.inteligr8.alfresco.asie.rest;

		import java.io.IOException;
		import java.util.HashSet;
		import java.util.Set;

		import org.apache.commons.lang3.StringUtils;
		import org.slf4j.Logger;
		import org.slf4j.LoggerFactory;
		import org.springframework.beans.factory.InitializingBean;
		import org.springframework.beans.factory.annotation.Autowired;
		import org.springframework.beans.factory.annotation.Qualifier;
		import org.springframework.beans.factory.annotation.Value;
		@@ -23,7 +20,7 @@ import com.inteligr8.rs.ClientCxfImpl;

		import jakarta.ws.rs.client.ClientRequestContext;

		public abstract class AbstractAsieWebScript extends AbstractWebScript implements InitializingBean {
		public abstract class AbstractAsieWebScript extends AbstractWebScript {

		private final Logger logger = LoggerFactory.getLogger(this.getClass());

		@@ -42,9 +39,6 @@ public abstract class AbstractAsieWebScript extends AbstractWebScript implements
		@Value("${solr.sharedSecret}")
		private String solrSharedSecret;

		@Value("${inteligr8.asie.allowedAuthorities}")
		private String authorizedAuthoritiesStr;

		@Value("${inteligr8.asie.basePath}")
		private String solrBaseUrl;

		@@ -52,29 +46,12 @@ public abstract class AbstractAsieWebScript extends AbstractWebScript implements
		@Qualifier(Constants.QUALIFIER_ASIE)
		private ObjectMapper objectMapper;

		private Set<String> authorizedAuthorities;

		@Override
		public void afterPropertiesSet() throws Exception {
		this.authorizedAuthorities = new HashSet<>();
		String[] authorities = this.authorizedAuthoritiesStr.split(",");
		for (String authority : authorities) {
		authority = StringUtils.trimToNull(authority);
		if (authority != null)
		this.authorizedAuthorities.add(authority);
		}

		if (this.authorizedAuthorities.isEmpty())
		this.logger.warn("All authenticated users will be authorized to access ASIE web scripts");

		super.afterPropertiesSet();
		this.solrSharedSecret = StringUtils.trimToNull(this.solrSharedSecret);
		}

		@Override
		protected Set<String> getAuthorities() {
		return this.authorizedAuthorities;
		}

		protected ObjectMapper getObjectMapper() {
		return this.objectMapper;
		}

shared/src/main/java/com/inteligr8/alfresco/asie/rest/AbstractWebScript.java

+46 −2

Original line number	Diff line number	Diff line
		@@ -4,11 +4,19 @@ import java.io.IOException;
		import java.lang.reflect.Constructor;
		import java.lang.reflect.InvocationTargetException;
		import java.lang.reflect.Method;
		import java.util.Collections;
		import java.util.HashSet;
		import java.util.Set;

		import org.alfresco.repo.security.authentication.AuthenticationUtil;
		import org.alfresco.service.cmr.security.AuthorityService;
		import org.apache.commons.lang3.StringUtils;
		import org.slf4j.Logger;
		import org.slf4j.LoggerFactory;
		import org.springframework.extensions.webscripts.Description.RequiredAuthentication;
		import org.springframework.beans.factory.InitializingBean;
		import org.springframework.beans.factory.annotation.Autowired;
		import org.springframework.beans.factory.annotation.Value;
		import org.springframework.extensions.webscripts.WebScriptException;
		import org.springframework.extensions.webscripts.WebScriptRequest;
		import org.springframework.extensions.webscripts.WebScriptResponse;
		@@ -16,9 +24,38 @@ import org.springframework.http.HttpStatus;

		import net.sf.acegisecurity.GrantedAuthority;

		public abstract class AbstractWebScript extends org.springframework.extensions.webscripts.AbstractWebScript {
		public abstract class AbstractWebScript extends org.springframework.extensions.webscripts.AbstractWebScript implements InitializingBean {

		protected abstract Set<String> getAuthorities();
		private final Logger logger = LoggerFactory.getLogger(this.getClass());

		@Value("${inteligr8.asie.allowedAuthorities}")
		private String authorizedAuthoritiesStr;

		@Autowired
		private AuthorityService authorityService;

		private Set<String> authorizedAuthorities;

		@Override
		public void afterPropertiesSet() throws Exception {
		this.authorizedAuthorities = new HashSet<>();
		String[] authorities = this.authorizedAuthoritiesStr.split(",");
		for (String authority : authorities) {
		authority = StringUtils.trimToNull(authority);
		if (authority != null)
		this.authorizedAuthorities.add(authority);
		}

		if (this.authorizedAuthorities.isEmpty()) {
		this.logger.warn("All authenticated users will be authorized to access web scripts");
		} else {
		this.logger.debug("Allowing only authorities: {}", this.authorizedAuthorities);
		}
		}

		protected Set<String> getAuthorities() {
		return this.authorizedAuthorities;
		}

		@Override
		public final void execute(WebScriptRequest request, WebScriptResponse response) throws IOException {
		@@ -38,6 +75,13 @@ public abstract class AbstractWebScript extends org.springframework.extensions.w
		return true;
		}

		Set<String> authorities = this.authorityService.getAuthoritiesForUser(AuthenticationUtil.getFullyAuthenticatedUser());
		if (authorities != null) {
		if (!Collections.disjoint(this.getAuthorities(), authorities))
		return true;
		}

		this.logger.trace("Not authorized: user '{}'; authorities: {} + {}", AuthenticationUtil.getFullyAuthenticatedUser(), AuthenticationUtil.getFullAuthentication().getAuthorities(), authorities);
		return false;
		}

shared/src/main/java/com/inteligr8/alfresco/asie/rest/ClearRegistryWebScript.java

+4 −5

Original line number	Diff line number	Diff line
		@@ -3,7 +3,6 @@ package com.inteligr8.alfresco.asie.rest;
		import java.io.IOException;

		import org.springframework.beans.factory.annotation.Autowired;
		import org.springframework.extensions.webscripts.AbstractWebScript;
		import org.springframework.extensions.webscripts.WebScriptRequest;
		import org.springframework.extensions.webscripts.WebScriptResponse;
		import org.springframework.http.HttpStatus;
		@@ -22,11 +21,11 @@ public class ClearRegistryWebScript extends AbstractWebScript {
		private ShardStateService sss;

		@Override
		public void execute(WebScriptRequest req, WebScriptResponse res) throws IOException {
		public void executeAuthorized(WebScriptRequest request, WebScriptResponse response) throws IOException {
		this.sss.clear();
		this.sbs.forget();

		res.setStatus(HttpStatus.OK.value());
		response.setStatus(HttpStatus.OK.value());
		}

		}

shared/src/main/java/com/inteligr8/alfresco/asie/service/ShardBackupService.java

+4 −38

Original line number	Diff line number	Diff line
		package com.inteligr8.alfresco.asie.service;

		import java.io.Serializable;

		import org.alfresco.service.cmr.attributes.AttributeService;
		import org.slf4j.Logger;
		import org.slf4j.LoggerFactory;
		@@ -11,6 +9,7 @@ import org.springframework.beans.factory.annotation.Value;
		import org.springframework.stereotype.Component;

		import com.inteligr8.alfresco.asie.Constants;
		import com.inteligr8.alfresco.asie.model.PersistedNode;
		import com.inteligr8.alfresco.asie.model.ShardSet;
		import com.inteligr8.alfresco.asie.model.SolrHost;

		@@ -31,10 +30,10 @@ public class ShardBackupService implements com.inteligr8.alfresco.asie.spi.Shard
		String shardKey = shardSet.getCore() + "-" + shardId;

		PersistedNode backupNode = (PersistedNode) this.attributeService.getAttribute(Constants.ATTR_ASIE, ATTR_BACKUP_NODE, shardKey);
		this.logger.debug("Found backup node: {}", backupNode);
		logger.debug("Found backup node: {}", backupNode);

		if (backupNode == null \|\| backupNode.isExpired()) {
		backupNode = new PersistedNode(node);
		backupNode = new PersistedNode(node, this.persistTimeMinutes);
		this.attributeService.setAttribute(backupNode, Constants.ATTR_ASIE, ATTR_BACKUP_NODE, shardKey);
		}

		@@ -50,37 +49,4 @@ public class ShardBackupService implements com.inteligr8.alfresco.asie.spi.Shard
		this.attributeService.removeAttribute(Constants.ATTR_ASIE, ATTR_BACKUP_NODE, shardKey);
		}



		private class PersistedNode implements Serializable {

		private static final long serialVersionUID = 4105196543023419818L;

		private final SolrHost node;
		private long expireTimeMillis;

		PersistedNode(SolrHost node) {
		this.node = node;
		this.reset();
		}

		void reset() {
		this.expireTimeMillis = System.currentTimeMillis() + persistTimeMinutes * 60L * 1000L;
		}

		boolean isExpired() {
		return this.expireTimeMillis < System.currentTimeMillis();
		}

		SolrHost getNode() {
		return this.node;
		}

		@Override
		public String toString() {
		return "node: " + this.node + "; expires in: " + (System.currentTimeMillis() - this.expireTimeMillis) + " ms";
		}

		}

		}