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

SDK-75 Fixed random SSL issues for RSA authentication #118

Merged
merged 4 commits into from
Jun 1, 2020
Merged

SDK-75 Fixed random SSL issues for RSA authentication #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
607a005
SDK-75 Fixed SSL issues for RSA authentication
thibauult May 30, 2020
1a78bbd
SDK-75 Added doc for Retry configuration
thibauult May 30, 2020
82f51c2
SDK-75 Added unit tests, simplified SymConfig class with Lombok usage
thibauult May 31, 2020
273da3e
SDK-75 Added more unit tests, better error management in SymBotRSAAut…
thibauult Jun 1, 2020
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
7 changes: 7 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,13 @@ can exclude the bot certificate section, all extension app sections and all opti
// Optional: If custom URI schemes need to be supported by MessageML parser
By setting this property, the default schemes (http and https) will be overridden
"supportedUriSchemes": ["http", "https", "customScheme"],

// Optional/experimental: exponential backoff configuration for retries
"retry": {
"maxAttempts": 10,
"initialIntervalMillis": 500,
"multiplier": 1.5
}
}
```

Expand Down
294 changes: 161 additions & 133 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,39 +9,152 @@
<url>https://github.com/SymphonyPlatformSolutions/symphony-api-client-java</url>
<description>Symphony API Client provided by Symphony Platform Solutions team</description>

<licenses>
<license>
<name>MIT License</name>
<url>http://www.opensource.org/licenses/mit-license.php</url>
</license>
</licenses>

<developers>
<developer>
<name>Symphony Platform Solutions</name>
<email>platformsolutions@symphony.com</email>
<organization>Symphony Communication Services</organization>
<organizationUrl>https://symphony.com/</organizationUrl>
</developer>
</developers>

<scm>
<connection>scm:git:git://github.com/SymphonyPlatformSolutions/symphony-api-client-java.git</connection>
<developerConnection>scm:git:ssh://github.com/SymphonyPlatformSolutions/symphony-api-client-java.git</developerConnection>
<url>https://github.com/SymphonyPlatformSolutions/symphony-api-client-java</url>
</scm>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jjwt.version>0.9.1</jjwt.version>

<!-- Dependencies versions (alphabetical order) -->
<apiguardian-api.version>1.1.0</apiguardian-api.version>
<commons-beanutils.version>1.9.4</commons-beanutils.version>
<commons-codec.version>1.14</commons-codec.version>
<commons-io.version>2.6</commons-io.version>
<commons-beanutils.version>1.9.4</commons-beanutils.version>
<jackson.version>2.11.0</jackson.version>
<jersey.version>2.30</jersey.version>
<slf4j.version>1.7.30</slf4j.version>
<jjwt.version>0.9.1</jjwt.version>
<lombok.version>1.18.10</lombok.version>
<messageml.version>0.9.51</messageml.version>
<resilience4j-retry.version>1.4.0</resilience4j-retry.version>
<jsr305.version>3.0.2</jsr305.version>
<slf4j.version>1.7.30</slf4j.version>
</properties>

<dependencies>
<dependency>
<groupId>io.github.resilience4j</groupId>
<artifactId>resilience4j-retry</artifactId>
<version>${resilience4j-retry.version}</version>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<version>${jsr305.version}</version>
</dependency>
<dependency>
<groupId>org.apiguardian</groupId>
<artifactId>apiguardian-api</artifactId>
<version>${apiguardian-api.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${lombok.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-jackson</artifactId>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-multipart</artifactId>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.connectors</groupId>
<artifactId>jersey-apache-connector</artifactId>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.inject</groupId>
<artifactId>jersey-hk2</artifactId>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.symphonyoss.symphony</groupId>
<artifactId>messageml</artifactId>
<version>${messageml.version}</version>
</dependency>
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt</artifactId>
<version>${jjwt.version}</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>${commons-codec.version}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${commons-io.version}</version>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>${commons-beanutils.version}</version>
</dependency>
<dependency>
<!-- TODO /!\ TO BE REMOVED /!\ -->
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>4.0.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.3.1</version>
<exclusions>
<exclusion>
<groupId>javax.activation</groupId>
<artifactId>javax.activation-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<!-- TODO /!\ TO BE REMOVED /!\ -->
<groupId>org.bitbucket.b_c</groupId>
<artifactId>jose4j</artifactId>
<version>0.7.1</version>
</dependency>

<!-- Testing dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock-jre8</artifactId>
<version>2.26.3</version>
<scope>test</scope>
</dependency>

</dependencies>

<build>
<plugins>
<plugin>
Expand Down Expand Up @@ -145,114 +258,6 @@
</plugins>
</build>

<dependencies>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.10.2</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${lombok.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-jackson</artifactId>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-multipart</artifactId>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.connectors</groupId>
<artifactId>jersey-apache-connector</artifactId>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.inject</groupId>
<artifactId>jersey-hk2</artifactId>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.symphonyoss.symphony</groupId>
<artifactId>messageml</artifactId>
<version>0.9.47</version>
</dependency>
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt</artifactId>
<version>${jjwt.version}</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>${commons-codec.version}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${commons-io.version}</version>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>${commons-beanutils.version}</version>
</dependency>
<dependency>
<groupId>org.bitbucket.b_c</groupId>
<artifactId>jose4j</artifactId>
<version>0.7.0</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>4.0.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock-jre8</artifactId>
<version>2.25.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.3.1</version>
<exclusions>
<exclusion>
<groupId>javax.activation</groupId>
<artifactId>javax.activation-api</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>

<distributionManagement>
<snapshotRepository>
<id>ossrh</id>
Expand Down Expand Up @@ -293,4 +298,27 @@
</build>
</profile>
</profiles>

<licenses>
<license>
<name>MIT License</name>
<url>http://www.opensource.org/licenses/mit-license.php</url>
</license>
</licenses>

<developers>
<developer>
<name>Symphony Platform Solutions</name>
<email>platformsolutions@symphony.com</email>
<organization>Symphony Communication Services</organization>
<organizationUrl>https://symphony.com/</organizationUrl>
</developer>
</developers>

<scm>
<connection>scm:git:git://github.com/SymphonyPlatformSolutions/symphony-api-client-java.git</connection>
<developerConnection>scm:git:ssh://github.com/SymphonyPlatformSolutions/symphony-api-client-java.git</developerConnection>
<url>https://github.com/SymphonyPlatformSolutions/symphony-api-client-java</url>
</scm>

</project>
1 change: 1 addition & 0 deletions src/lombok.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
lombok.log.fieldName=logger
8 changes: 6 additions & 2 deletions src/main/java/authentication/ISymAuth.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,16 @@
import exceptions.AuthenticationException;

public interface ISymAuth {

void authenticate() throws AuthenticationException;
void sessionAuthenticate() throws AuthenticationException;
void kmAuthenticate() throws AuthenticationException;

String getSessionToken();
void setSessionToken(String sessionToken);
@Deprecated void setSessionToken(String sessionToken);

String getKmToken();
void setKmToken(String kmToken);
@Deprecated void setKmToken(String kmToken);

void logout();
}
Loading