Skip to content

Commit

Permalink
addition of the application type 'eID-server' and general improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
rk8129406 committed Mar 8, 2023
1 parent d3b7dd5 commit c9f4456
Show file tree
Hide file tree
Showing 226 changed files with 11,358 additions and 1,884 deletions.
357 changes: 238 additions & 119 deletions task/README.md
100644 → 100755

Large diffs are not rendered by default.

134 changes: 134 additions & 0 deletions task/changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,136 @@
# Changelog for Version 0.5.2
## This is fixed
### Testbed fixes
* Fix Nullpointer Exception during the build.
* Remove duplicated test testMICSParser.

## This is new
### Testbed improvements
* Update documentation
* Update Recommended and Mandatory profiles for TR-03130-1-AM-TLS-EID-SERVER-ECARD-API-INTERFACE-PSK/NONPSK

# Changelog for Version 0.5.1

## This is fixed

### Testbed fixes
* Remove unused/unnecessary Dockerfile.
* Fix documentation in ExampleGlobalConfig
* Minor changes in README
* RMIURL and RMIPort are not written into every TRP anymore
* Exemplary MICS and TRP files have been made more generic
* Fixed a timing bug, which may have resulted in the Application Specific Inspection Instructions of the eID-Client Interfaces not being tested correctly.
* Fixed a bug regarding the TLS-2 connection of an eID-Client.
* For negative Testcases in A1, it is additionally checked if the handshake successful message was not logged
* For session resumption testcases TLS_A1_FR_10 and TLS_A1_FR_11, after the initial handshake it is now correctly checked if the session is closed successfully
* TLS_B1_FR_11 and TLS_B2_FR_10 are now only executed for TLS 1.2


# Changelog for Version 0.5.0

## This is new


### Testbed improvements
* Global configuration value of 'tls_test_tool_path' can now be provided as a relative path.
* Improved eID-Client motivator by using the Browsersimulator
* eID-Server support in the Testcase Executor
* eID-Server support in TLS Test Tool

### Created documents
* example MICS and TRP for eID Server


### Testcases Implemented for eID-server

* Module B1-FR
* TLS_B1_FR_15
* TLS_B1_FR_16
* TLS_B1_FR_17
* Module B2-FR
* TLS_B2_FR_01_T
* TLS_B2_FR_11
* TLS_B2_FR_14
* TLS_B2_FR_15
* TLS_B2_FR_16
* Module B2-GP
* TLS_B2_GP_01_T
* TLS_B2_GP_02
* TLS_B2_GP_03_T
* TLS_B2_GP_04
* TLS_B2_GP_05_T
* TLS_B2_GP_08
* TLS_B2_GP_10


### Testcases Updated for eID-server

* Module B1-GP
* TLS_B1_GP_01_T
* TLS_B1_GP_02
* TLS_B1_GP_03_T
* TLS_B1_GP_04
* TLS_B1_GP_05_T
* TLS_B1_GP_06
* TLS_B1_GP_07_T


### Orphaned Testcases Implemented

* Module B1-GP
* TLS_B1_GP_06
* Module B1-FR
* TLS_B1_FR_10_T
* TLS_B1_FR_14
* Module B2-GP
* TLS_B2_GP_06
* TLS_B2_GP_07_T
* Module B2-FR
* TLS_B2_FR_04
* TLS_B2_FR_06
* TLS_B2_FR_07
* TLS_B2_FR_08


### Testcases updated for TLS 1.3

* Module B1-FR
* TLS_B1_FR_03
* TLS_B1_FR_04
* TLS_B1_FR_06
* TLS_B1_FR_07
* TLS_B1_FR_08
* TLS_B1_FR_10_T
* TLS_B1_FR_11
* TLS_B1_FR_13
* TLS_B1_FR_16
* Module B1-GP
* TLS_B1_GP_01_T
* TLS_B1_GP_02
* TLS_B1_GP_03_T
* TLS_B1_GP_04
* TLS_B1_GP_05
* TLS_B1_GP_06
* TLS_B1_GP_07_T
* Module B2-FR
* TLS_B2_FR_03
* TLS_B2_FR_04
* TLS_B2_FR_06
* TLS_B2_FR_07
* TLS_B2_FR_08
* TLS_B2_FR_10
* TLS_B2_FR_11
* TLS_B2_FR_13
* TLS_B2_FR_16
* Module B2-GP
* TLS_B2_GP_01_T
* TLS_B2_GP_02
* TLS_B2_GP_03_T
* TLS_B2_GP_04
* TLS_B2_GP_05
* TLS_B2_GP_06
* TLS_B2_GP_07_T

# Changelog for Version 0.4.2

## This is fixed
Expand All @@ -6,6 +139,7 @@
### Testcase fixes
* Fixed testcase TLS_A1_GP_06_T


# Changelog for Version 0.4.1

## This is fixed
Expand Down
10 changes: 5 additions & 5 deletions task/com.achelos.task.abstractinterface/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.achelos.task</groupId>
<artifactId>com.achelos.task</artifactId>
<version>0.4.2</version>
<version>0.5.2</version>
</parent>
<artifactId>com.achelos.task.abstractinterface</artifactId>

Expand All @@ -12,22 +12,22 @@
<dependency>
<groupId>com.achelos.task</groupId>
<artifactId>com.achelos.task.logging</artifactId>
<version>0.4.2</version>
<version>0.5.2</version>
</dependency>
<dependency>
<groupId>com.achelos.task</groupId>
<artifactId>com.achelos.task.micsverifier</artifactId>
<version>0.4.2</version>
<version>0.5.2</version>
</dependency>
<dependency>
<groupId>com.achelos.task</groupId>
<artifactId>com.achelos.task.testsuitesetup</artifactId>
<version>0.4.2</version>
<version>0.5.2</version>
</dependency>
<dependency>
<groupId>com.achelos.task</groupId>
<artifactId>com.achelos.task.testcaseexecutionengine</artifactId>
<version>0.4.2</version>
<version>0.5.2</version>
</dependency>
</dependencies>

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
package com.achelos.task.abstractinterface;

import com.achelos.task.logging.LoggingConnector;

import java.io.File;
import java.util.ArrayList;
import java.util.List;

public class TaskExecutionParameters {
private final TaskExecutionMode executionMode;
// General Parameters
private final LoggingConnector logger;
private final File configFile;
private final String reportDirectory;
private final String clientAuthCertChain;
private final String clientAuthKeyFile;

// ExecutionMode specific parameters
private final File testRunPlanFile;
private final File micsFile;
private final List<File> certificateFileList;
private final boolean ignoreMicsVerification;

public TaskExecutionParameters(final LoggingConnector logger,
final File configFile,
final File micsFile,
final List<File> certificateFileList,
final boolean ignoreMicsVerification,
final String reportDirectory,
final String clientAuthCertChain,
final String clientAuthKeyFile) {
this.logger = LoggingConnector.getInstance();
this.configFile = configFile;
this.certificateFileList = certificateFileList != null ? new ArrayList<>(certificateFileList) : new ArrayList<>();
this.ignoreMicsVerification = ignoreMicsVerification;
this.executionMode = TaskExecutionMode.MICS;
this.micsFile = micsFile;
this.reportDirectory = reportDirectory;
this.clientAuthCertChain = clientAuthCertChain;
this.clientAuthKeyFile = clientAuthKeyFile;

// Unused parameters for this execution mode
this.testRunPlanFile = null;
}

public TaskExecutionParameters(final LoggingConnector logger,
final File testRunPlanFile,
final File configFile,
final String reportDirectory,
final String clientAuthCertChain,
final String clientAuthKeyFile) {
this.logger = LoggingConnector.getInstance();
this.configFile = configFile;
this.testRunPlanFile = testRunPlanFile;
this.executionMode = TaskExecutionMode.TRP;
this.reportDirectory = reportDirectory;
this.clientAuthCertChain = clientAuthCertChain;
this.clientAuthKeyFile = clientAuthKeyFile;

// Unused parameters for this execution mode
this.ignoreMicsVerification = false;
this.certificateFileList = null;
this.micsFile = null;
}

public TaskExecutionMode getExecutionMode() {
return executionMode;
}

public LoggingConnector getLogger() {
return LoggingConnector.getInstance();
}

public File getConfigFile() {
return configFile;
}

public String getReportDirectory() {
return reportDirectory;
}

public String getClientAuthCertChain() {
return clientAuthCertChain;
}

public String getClientAuthKeyFile() {
return clientAuthKeyFile;
}

public File getTestRunPlanFile() {
return testRunPlanFile;
}

public File getMicsFile() {
return micsFile;
}

public List<File> getCertificateFileList() {
return new ArrayList<>(certificateFileList);
}

public boolean isIgnoreMicsVerification() {
return ignoreMicsVerification;
}

public static enum TaskExecutionMode {
TRP,
MICS;
}
}
Loading

0 comments on commit c9f4456

Please sign in to comment.