Skip to content

Commit

Permalink
Merge pull request #19 from afabiani/dependabot/maven/src/org.jasypt-…
Browse files Browse the repository at this point in the history 
…jasypt-1.9.2

Bump org.jasypt:jasypt from 1.8 to 1.9.2 in /src
  • Loading branch information
@afabiani
afabiani authored Feb 12, 2024
2 parents d3d984d + 927a3a9 commit 97ba95b
Show file tree
Hide file tree
Showing 4 changed files with 57 additions and 46 deletions.
2 changes: 1 addition & 1 deletion src/core/security/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
</dependency>
<dependency>
<groupId>org.jasypt</groupId>
<artifactId>jasypt</artifactId>
<artifactId>jasypt-acegisecurity</artifactId>
</dependency>
<dependency>
<groupId>org.acegisecurity</groupId>
Expand Down
4 changes: 2 additions & 2 deletions ...n/java/it/geosolutions/geostore/core/security/password/GeoStoreDigestPasswordEncoder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@

import org.apache.commons.codec.binary.Base64;
import org.jasypt.digest.StandardByteDigester;
import org.jasypt.spring.security.PasswordEncoder;
import org.jasypt.acegisecurity.PasswordEncoder;
import org.jasypt.util.password.StrongPasswordEncryptor;
import static it.geosolutions.geostore.core.security.password.SecurityUtils.toBytes;

/**
* This Encoder provide encription and check of password using a digest
* This Encoder provide encryption and check of password using a digest
* @author Lorenzo Natali (lorenzo.natali at geo-solutions.it)
*
*/
Expand Down
32 changes: 14 additions & 18 deletions ...src/test/java/it/geosolutions/geostore/rest/service/impl/RESTResourceServiceImplTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,10 @@
import it.geosolutions.geostore.core.model.enums.DataType;
import it.geosolutions.geostore.core.model.enums.Role;
import it.geosolutions.geostore.services.ServiceTestBase;
import it.geosolutions.geostore.services.exception.BadRequestServiceEx;
import it.geosolutions.geostore.services.exception.NotFoundServiceEx;
import it.geosolutions.geostore.services.rest.impl.RESTResourceServiceImpl;
import it.geosolutions.geostore.services.rest.model.RESTAttribute;
import it.geosolutions.geostore.services.rest.utils.MockSecurityContext;
import org.junit.Before;
import org.junit.Test;
import org.junit.Assert;

import javax.ws.rs.core.SecurityContext;
import java.util.ArrayList;
Expand All @@ -43,15 +40,14 @@
public class RESTResourceServiceImplTest extends ServiceTestBase {

RESTResourceServiceImpl restService;
long adminID;

@Before
public void setUp() throws BadRequestServiceEx, NotFoundServiceEx {
@Override
public void setUp() throws Exception {
super.setUp();
restService = new RESTResourceServiceImpl();
restService.setResourceService(resourceService);
}

@Test
public void testUpdateResource_editorUpdate() throws Exception {
// insert fake user for security context
long u0ID = createUser("u0", Role.USER, "p0");
Expand Down Expand Up @@ -97,12 +93,12 @@ public void testUpdateResource_editorUpdate() throws Exception {

// verify the attribute has been changed
Attribute a = sr.getAttribute().get(0);
assertEquals(a.getName(), NAME);
assertEquals(a.getValue(), VALUE);
assertEquals(a.getType(), DataType.STRING);
Assert.assertEquals(a.getName(), NAME);
Assert.assertEquals(a.getValue(), VALUE);
Assert.assertEquals(a.getType(), DataType.STRING);

assertEquals(sr.getCreator(), "u0");
assertEquals(sr.getEditor(), "u0");
Assert.assertEquals(sr.getCreator(), "u0");
Assert.assertEquals(sr.getEditor(), "u0");

// Update rule as "user1"
// insert fake user for security context
Expand All @@ -127,11 +123,11 @@ public void testUpdateResource_editorUpdate() throws Exception {

// verify the attribute has been changed
a = sr.getAttribute().get(0);
assertEquals(a.getName(), NAME);
assertEquals(a.getValue(), VALUE);
assertEquals(a.getType(), DataType.STRING);
Assert.assertEquals(a.getName(), NAME);
Assert.assertEquals(a.getValue(), VALUE);
Assert.assertEquals(a.getType(), DataType.STRING);

assertEquals(sr.getCreator(), "u0");
assertEquals(sr.getEditor(), "u1");
Assert.assertEquals(sr.getCreator(), "u0");
Assert.assertEquals(sr.getEditor(), "u1");
}
}
65 changes: 40 additions & 25 deletions src/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,25 @@
<geoapi-version>2.3-M1</geoapi-version>
<gt-version>2.7-RC2</gt-version>
<jackson-version>2.16.1</jackson-version>
<gson.version>2.9.0</gson.version>
<quartz.version>1.5.2</quartz.version>
<jdom.version>1.0</jdom.version>
<commons-io.version>2.7</commons-io.version>
<httpclient.version>4.5.13</httpclient.version>
<acegi-security-tiger.version>1.0.7</acegi-security-tiger.version>
<hibernate-jpa-2.1-api.version>1.0.2.Final</hibernate-jpa-2.1-api.version>
<javax.servlet-api.version>3.0.1</javax.servlet-api.version>
<junit.version>4.13.1</junit.version>
<hibernate-spatial-postgis.version>1.1.1</hibernate-spatial-postgis.version>
<postgis-jdbc.version>1.3.3</postgis-jdbc.version>
<postgresql.version>42.3.8</postgresql.version>
<jts.version>1.10</jts.version>
<jai_core.version>1.1.3</jai_core.version>
<jai_codec.version>1.1.3</jai_codec.version>
<jai_imageio.version>1.1</jai_imageio.version>
<jt-utils.version>1.1.1</jt-utils.version>
<jsr-275.version>1.0-beta-2</jsr-275.version>
<jasypt-acegisecurity.version>1.9.3</jasypt-acegisecurity.version>
</properties>

<ciManagement>
Expand Down Expand Up @@ -277,7 +296,7 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.9.0</version>
<version>${gson.version}</version>
</dependency>


Expand All @@ -297,7 +316,7 @@
<dependency>
<groupId>quartz</groupId>
<artifactId>quartz</artifactId>
<version>1.5.2</version>
<version>${quartz.version}</version>
</dependency>
<dependency>
<groupId>javassist</groupId>
Expand Down Expand Up @@ -335,13 +354,8 @@
<dependency>
<groupId>jdom</groupId>
<artifactId>jdom</artifactId>
<version>1.0</version>
<version>${jdom.version}</version>
</dependency>
<!-- <dependency>
<groupId>org.jdom</groupId>
<artifactId>jdom</artifactId>
<version>1.1</version>
</dependency>-->

<!-- =========================================================== -->
<!-- APACHE COMMONS -->
Expand All @@ -354,12 +368,12 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.7</version>
<version>${commons-io.version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.13</version>
<version>${httpclient.version}</version>
</dependency>
<dependency>
<groupId>commons-dbcp</groupId>
Expand Down Expand Up @@ -692,13 +706,14 @@
</dependency>
<dependency>
<groupId>org.jasypt</groupId>
<artifactId>jasypt</artifactId>
<version>1.8</version>
<artifactId>jasypt-acegisecurity</artifactId>
<version>${jasypt-acegisecurity.version}</version>
</dependency>

<dependency>
<groupId>org.acegisecurity</groupId>
<artifactId>acegi-security-tiger</artifactId>
<version>1.0.7</version>
<version>${acegi-security-tiger.version}</version>
<exclusions>
<exclusion>
<groupId>log4j</groupId>
Expand All @@ -721,7 +736,7 @@
<dependency>
<groupId>org.hibernate.javax.persistence</groupId>
<artifactId>hibernate-jpa-2.1-api</artifactId>
<version>1.0.2.Final</version>
<version>${hibernate-jpa-2.1-api.version}</version>
</dependency>


Expand All @@ -731,7 +746,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.0.1</version>
<version>${javax.servlet-api.version}</version>
<scope>provided</scope>
</dependency>

Expand Down Expand Up @@ -780,7 +795,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>

Expand Down Expand Up @@ -834,7 +849,7 @@
<dependency>
<groupId>org.hibernatespatial</groupId>
<artifactId>hibernate-spatial-postgis</artifactId>
<version>1.1.1</version>
<version>${hibernate-spatial-postgis.version}</version>
</dependency>

<!-- =========================================================== -->
Expand All @@ -843,17 +858,17 @@
<dependency>
<groupId>org.postgis</groupId>
<artifactId>postgis-jdbc</artifactId>
<version>1.3.3</version>
<version>${postgis-jdbc.version}</version>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.3.8</version>
<version>${postgresql.version}</version>
</dependency>
<dependency>
<groupId>com.vividsolutions</groupId>
<artifactId>jts</artifactId>
<version>1.10</version>
<version>${jts.version}</version>
</dependency>


Expand All @@ -863,29 +878,29 @@
<dependency>
<groupId>javax.media</groupId>
<artifactId>jai_core</artifactId>
<version>1.1.3</version>
<version>${jai_core.version}</version>
</dependency>
<dependency>
<groupId>javax.media</groupId>
<artifactId>jai_codec</artifactId>
<version>1.1.3</version>
<version>${jai_codec.version}</version>
</dependency>
<dependency>
<groupId>javax.media</groupId>
<artifactId>jai_imageio</artifactId>
<version>1.1</version>
<version>${jai_imageio.version}</version>
</dependency>

<dependency>
<groupId>com.googlecode.jaitools</groupId>
<artifactId>jt-utils</artifactId>
<version>1.1.1</version>
<version>${jt-utils.version}</version>
</dependency>

<dependency>
<groupId>net.java.dev.jsr-275</groupId>
<artifactId>jsr-275</artifactId>
<version>1.0-beta-2</version>
<version>${jsr-275.version}</version>
</dependency>

<dependency>
Expand Down

0 comments on commit 97ba95b

Please sign in to comment.