Merge branch 'develop' into release/11.1

pom.xml

@@ -6,7 +6,7 @@
 	<artifactId>siga-doc</artifactId>
 	<packaging>pom</packaging>
 	<!-- Registro Centralizado da Versão do SIGA -->
-	<version>11.1.0</version>
+	<version>11.1-SNAPSHOT</version>
 
 	<modules>		
 		<module>siga-base</module>
@@ -92,7 +92,7 @@
 			            	<Project-Version>${project.version}</Project-Version>
 
 							<Build-Time>${maven.build.timestamp}</Build-Time>
-							<Build-Label>${project.version}-${git.commit.id.abbrev}</Build-Label>
+							<Build-Label>${git.tags}-${git.commit.id.abbrev}</Build-Label>
 
 							<SCM-RemoteURL>${git.remote.origin.url}</SCM-RemoteURL>
 							<SCM-CommitId>${git.commit.id}</SCM-CommitId>
@@ -162,25 +162,6 @@
 			<url>https://repository.jboss.org/nexus/content/repositories/deprecated</url>
 		</repository>
 
-		<!-- repositorio adicionado para a swetake
-		<repository>
-			<id>swetake</id>
-			<url>https://itrc.jju.edu.cn/nexus-2.0.6/content/repositories/thirdparty/</url>
-		</repository>
-		 -->
-
-		<!-- repositorio adicionado para a simplecaptcha -->
-		<!-- Edson: removendo pois está quebrado -->
-		<!--<repository>
-			<id>simplecaptcha</id>
-			<url>https://maven.nfms4redd.org/</url>
-		</repository>-->
-		<!-- repositorio adicionado para o dynamic jasper
-		<repository>
-	    	<id>fdvsolution.public</id>
-	    	<url>https://nexus.fdvs.com.ar/content/groups/public/</url>
-	    </repository>
-	     -->
 	</repositories>
 
 	<dependencyManagement>

siga-arq/pom.xml

@@ -72,13 +72,13 @@
 		<dependency>
 			<groupId>siga</groupId>
 			<artifactId>siga-jwt</artifactId>
-			<version>11.1.0</version>
+			<version>11.1-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>siga</groupId>
 			<artifactId>siga-base</artifactId>
-			<version>11.1.0</version>
+			<version>11.1-SNAPSHOT</version>
 		</dependency>
 
 	</dependencies>

siga-base/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>siga</groupId>
 		<artifactId>siga-doc</artifactId>
-		<version>11.1.0</version>
+		<version>11.1-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>

siga-base/src/main/java/br/gov/jfrj/siga/base/Prop.java

@@ -126,11 +126,15 @@ public static void defineGlobalProperties() {
 
 		/* Parâmetros para ativação de Login por SSO OAuth2/OIDC */
 		provider.addPublicProperty("/siga.integracao.sso", null);
+		provider.addPublicProperty("/siga.integracao.sso.nome", "SSO");
 		provider.addPublicProperty("/siga.integracao.sso.dominio", null);
+		provider.addPublicProperty("/siga.integracao.sso.dominio.logout", get("/siga.integracao.sso.dominio") + "/logout");
+		provider.addPublicProperty("/siga.integracao.sso.context", null);
+		provider.addPublicProperty("/siga.integracao.sso.iss", "/");
+		provider.addPublicProperty("/siga.integracao.sso.jwks.uri", "/jwk");
 		provider.addPrivateProperty("/siga.integracao.sso.cliente.id", null);
 		provider.addPrivateProperty("/siga.integracao.sso.client.secret", null);
 		provider.addPrivateProperty("/siga.integracao.sso.redirect.uri", get("/siga.base.url") + "/siga/callBack");
-		provider.addPublicProperty("/siga.integracao.sso.btn.txt", "Entrar com o SSO");
 		/* Parâmetros para ativação de Login por SSO OAuth2/OIDC */
 
 		provider.addPublicProperty("/siga.omitir.metodo2", "true");
@@ -199,8 +203,8 @@ public static void defineGlobalProperties() {
 		provider.addPublicProperty("/ckeditor.url", "/ckeditor/ckeditor/ckeditor.js");
 
 		/* Indica onde está armazenado o Manual de Operações* */
-		provider.addPublicProperty("/sigaex.manual.url", "/siga/arquivos/apostila_sigaex.pdf");
-		provider.addPublicProperty("/siga.manual.url", "/siga/arquivos/apostila_sigaex.pdf");
+		provider.addPublicProperty("/sigaex.manual.url", "https://sigadoc.gitbook.io/siga-doc");
+		provider.addPublicProperty("/siga.manual.url", "https://sigadoc.gitbook.io/siga-doc");
 
 		/* Services
 		 * 
@@ -221,6 +225,9 @@ public static void defineGlobalProperties() {
 		// Propriedade que controla o acesso ao método de conferência de assinaturas de Documentos da API REST
 		provider.addPrivateProperty("/sigaex.auditoria.assinaturas.password", null);
 
+		// Propriedade que controla o acesso ao método de númeração genérica da API REST
+		provider.addPrivateProperty("/sigaex.numeracao.generica.password", null);
+
 		/* Services
 		 * 
 		 * Declaração dos serviços e end-points SOAP e RESTful usados pelo back-end nos módulos

siga-base/src/main/java/br/gov/jfrj/siga/base/SigaVersion.java

@@ -19,9 +19,18 @@ public class SigaVersion {
 
 	public static void loadSigaVersion() {
 		try {
-			SIGA_VERSION = Manifests.read("Build-Label") != null ? Manifests.read("Build-Label") : "SNAPSHOT";
+			SIGA_VERSION = Manifests.read("Build-Label") != null ? Manifests.read("Build-Label")
+					.replace("-SNAPSHOT", "")
+					.replace("-RELEASE", "")
+					.replace("-FINAL", "") : "SNAPSHOT";
+
 			SIGA_PROJECT_VERSION = Manifests.read("Project-Version") != null ? Manifests.read("Project-Version") : "SNAPSHOT";
 
+			//Caso release não esteja taggeada, pega do project version
+			if (SIGA_VERSION.startsWith("-")) {
+				SIGA_VERSION = SIGA_PROJECT_VERSION;
+			}
+
 			SIGA_VERSION_DATE = Manifests.read("Build-Time") != null ? Manifests.read("Build-Time") : "NODATE";
 		} catch (Exception e) {
 			//reseta default

siga-cp/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>siga-doc</artifactId>
 		<groupId>siga</groupId>
-		<version>11.1.0</version>
+		<version>11.1-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>

siga-dump/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>siga-doc</artifactId>
 		<groupId>siga</groupId>
-		<version>11.1.0</version>
+		<version>11.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>siga-dump</artifactId>

siga-ex/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>siga-doc</artifactId>
 		<groupId>siga</groupId>
-		<version>11.1.0</version>
+		<version>11.1-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>

siga-ext/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>siga-doc</artifactId>
         <groupId>siga</groupId>
-        <version>11.1.0</version>
+        <version>11.1-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

siga-integracao/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>siga</groupId>
 		<artifactId>siga-doc</artifactId>
-		<version>11.1.0</version>
+		<version>11.1-SNAPSHOT</version>
 	</parent>
 
 	<packaging>jar</packaging>

siga-jwt/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>siga</groupId>
 		<artifactId>siga-doc</artifactId>
-		<version>11.1.0</version>
+		<version>11.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>siga-jwt</artifactId>
 	<name>siga-jwt</name>

siga-ldap-cli/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>siga</groupId>
 		<artifactId>siga-doc</artifactId>
-		<version>11.1.0</version>
+		<version>11.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>siga-ldap-cli</artifactId>

siga-ldap/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>siga-doc</artifactId>
         <groupId>siga</groupId>
-        <version>11.1.0</version>
+        <version>11.1-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

siga-oidc/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>siga</groupId>
 		<artifactId>siga-doc</artifactId>
-		<version>11.1.0</version>
+		<version>11.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>siga-oidc</artifactId>

siga-oidc/src/main/java/br/gov/sp/prodesp/siga/client/LoadProperties.java

@@ -25,11 +25,14 @@ public class LoadProperties {
 	/*   Formato dominio ex. https://homolog.login.sp.gov.br   */
 	static final String sso_dominio = "/siga.integracao.sso.dominio";
 
-	static final String iss = "/sts";	
-	static final String jwksUri = "/sts/.well-known/openid-configuration/jwks";
-	static final String authzUri = "/sts/connect/authorize";
-	static final String tokenUri = "/sts/connect/token";
-	static final String userInfoUri = "/sts/connect/userinfo";
+
+	static String sso_context = "/siga.integracao.sso.context"; /* /sts/connect */
+
+	static final String iss = "/siga.integracao.sso.iss";	
+	static final String jwksUri = "/siga.integracao.sso.jwks.uri"; //"/sts/.well-known/openid-configuration/jwks";
+	static final String authzUri = "/authorize";
+	static final String tokenUri = "/token";
+	static final String userInfoUri = "/userinfo";
 
 	static final String clientId = "/siga.integracao.sso.cliente.id";
 	static final String clientSecret = "/siga.integracao.sso.client.secret";
@@ -90,11 +93,13 @@ private void loadParameters() {
 		 * PARAMETERS 
 		 * standalone.xml
 		 */
-		parametersOIDC.setIss(Prop.get(sso_dominio) + iss);
-		parametersOIDC.setJwksUri(Prop.get(sso_dominio)  + jwksUri);		
-		parametersOIDC.setAuthzUri(Prop.get(sso_dominio)  + authzUri); 
-		parametersOIDC.setTokenUri(Prop.get(sso_dominio ) + tokenUri);
-		parametersOIDC.setUserInfoUri(Prop.get(sso_dominio)  + userInfoUri);
+
+		sso_context = Prop.get(sso_context) != null ? Prop.get(sso_context) : "";
+		parametersOIDC.setIss(Prop.get(sso_dominio) + Prop.get(iss));
+		parametersOIDC.setJwksUri(Prop.get(sso_dominio)  + Prop.get(jwksUri));		
+		parametersOIDC.setAuthzUri(Prop.get(sso_dominio)  + sso_context + authzUri); 
+		parametersOIDC.setTokenUri(Prop.get(sso_dominio ) + sso_context + tokenUri);
+		parametersOIDC.setUserInfoUri(Prop.get(sso_dominio)  + sso_context + userInfoUri);
 
 		parametersOIDC.setClientId(Prop.get(clientId));
 		parametersOIDC.setClientSecret(Prop.get(clientSecret));

siga-oidc/src/main/java/br/gov/sp/prodesp/siga/servlet/CallBackServlet.java

@@ -67,6 +67,7 @@
 import com.nimbusds.openid.connect.sdk.validators.IDTokenValidator;
 import com.thetransactioncompany.json.pretty.PrettyJson;
 
+import br.gov.jfrj.siga.base.Prop;
 import br.gov.sp.prodesp.siga.client.HTTPRequestParametersInterceptorServlet;
 import br.gov.sp.prodesp.siga.client.PendingAuthenticationRequest;
 import net.minidev.json.JSONObject;
@@ -261,24 +262,28 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws Se
 						createError("Invalid JWK set URL: " + e.getMessage());
 					return;
 				}
-
-				// Display the remote signing JWK for the ID token
-				try {
-					List<JWK> candidates = new RemoteJWKSet(pendingRequest.getProviderMetadata().getJWKSetURI().toURL())
-						.get(new JWKSelector(new JWKMatcher.Builder()
-							.keyType(KeyType.forAlgorithm(idToken.getHeader().getAlgorithm()))
-							.keyID(((SignedJWT)idToken).getHeader().getKeyID())
-							.build()),
-							null);
+				if (Prop.get("/siga.integracao.sso.jwks.uri") != null) {
 
-					if (candidates.isEmpty()) {
-							createError("No matching signing JWK found");
+
+					// Display the remote signing JWK for the ID token
+					try {
+						List<JWK> candidates = new RemoteJWKSet(pendingRequest.getProviderMetadata().getJWKSetURI().toURL())
+							.get(new JWKSelector(new JWKMatcher.Builder()
+								.keyType(KeyType.forAlgorithm(idToken.getHeader().getAlgorithm()))
+								.keyID(((SignedJWT)idToken).getHeader().getKeyID())
+								.build()),
+								null);
+
+						if (candidates.isEmpty()) {
+								createError("No matching signing JWK found");
+							return;
+						}
+
+					} catch (Exception e) {
+							createError("Couldn't retrieve OpenID provider JWK set: " + e.getMessage());
 						return;
 					}
-
-				} catch (Exception e) {
-						createError("Couldn't retrieve OpenID provider JWK set: " + e.getMessage());
-					return;
+
 				}
 
 			} else if (JWSAlgorithm.Family.HMAC_SHA.contains(idToken.getHeader().getAlgorithm())) {

siga-rel/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>siga-doc</artifactId>
         <groupId>siga</groupId>
-        <version>11.1.0</version>
+        <version>11.1-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

siga-sinc-lib/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>siga-doc</artifactId>
         <groupId>siga</groupId>
-        <version>11.1.0</version>
+        <version>11.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

siga-vraptor-module-old/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>siga-doc</artifactId>
 		<groupId>siga</groupId>
-		<version>11.1.0</version>
+		<version>11.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>siga-vraptor-module-old</artifactId>
 	<name>siga-vraptor-module-old</name>

siga-vraptor-module/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>siga-doc</artifactId>
 		<groupId>siga</groupId>
-		<version>11.1.0</version>
+		<version>11.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>siga-vraptor-module</artifactId>
 	<name>siga-vraptor-module</name>

siga-vraptor-module/src/main/resources/META-INF/tags/cabecalho.tag

@@ -99,10 +99,13 @@ ${meta}
 
 <c:set var="siga_version"  scope="request" value="${f:sigaVersion()}" />
 
+<c:set var="siga_cliente_sso" scope="request" value="${f:resource('/siga.integracao.sso')}" />
+<c:set var="siga_cliente_sso_btn_txt" scope="request" value="${f:resource('/siga.integracao.sso.nome')}" />
+
 <c:choose>
 	<c:when test="${siga_cliente == 'GOVSP'}">
 		<meta name="theme-color" content="#35b44">
-		<link rel="stylesheet" href="/siga/css/style_siga_govsp.css?v=1647962650" type="text/css" media="screen, projection">
+		<link rel="stylesheet" href="/siga/css/style_siga_govsp.css?v=1681243175" type="text/css" media="screen, projection">
 
 		<c:set var="body_color" value="body_color_govsp" scope="request" />
 
@@ -154,7 +157,7 @@ ${meta}
 	</c:otherwise>
 </c:choose>
 
-<link rel="stylesheet" href="/siga/css/style_siga.css?v=1647962650" type="text/css" media="screen, projection">
+<link rel="stylesheet" href="/siga/css/style_siga.css?v=1681243175" type="text/css" media="screen, projection">
 <link rel="shortcut icon" href="/siga/imagens/${ico_siga}" />
 
 
@@ -390,7 +393,7 @@ ${meta}
 										</c:when>
 									</c:choose>
 								</span>
-								<span >- v.${siga_version}</span>
+								<span >- ${siga_version}</span>
 							</div>
 						</div>
 
@@ -430,7 +433,17 @@ ${meta}
 									</c:catch> 
 								</span>
 							</div>
-							<button class="btn btn-danger btn-sm ml-3 mt-1 align-bottom" type="button" onclick="delSession();javascript:location.href='/siga/public/app/logout'"><i class="fas fa-sign-out-alt"></i> Sair</button>
+							<c:choose>
+								<c:when test="${siga_cliente_sso}">
+									<c:set var="siga_cliente_sso_logout_url" scope="request" value="${f:resource('/siga.integracao.sso.dominio.logout')}?post_logout_redirect_uri=${f:resource('/siga.base.url')}" />
+								</c:when>
+								<c:otherwise>
+									<c:set var="siga_cliente_sso_logout_url" scope="request" value="" />
+								</c:otherwise>
+							</c:choose>
+
+							<button class="btn btn-danger btn-sm ml-3 mt-1 align-bottom" type="button" onclick="delSession();javascript:location.href='${siga_cliente_sso_logout_url}/siga/public/app/logout'"><i class="fas fa-sign-out-alt"></i> Sair</button>
+
 							<div class="pt-1">
 								<c:catch>
 									<c:choose>

siga-wf/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>siga-doc</artifactId>
 		<groupId>siga</groupId>
-		<version>11.1.0</version>
+		<version>11.1-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>