Introduced geofencing param for mobileid cli, the geofencing data in the sign request becomes optional

Author: thomas4v

mid-java-client-usage/src/main/java/ch/swisscom/mid/client/cli/Cli.java

@@ -54,6 +54,7 @@ public class Cli {
     private static final String PARAM_REQUEST_TIMEOUT = "req-timeout";
     private static final String PARAM_REST = "rest";
     private static final String PARAM_SOAP = "soap";
+    private static final String PARAM_GEO = "geofencing";
     private static final String PARAM_VALIDATE_SIGNATURE = "validate";
     private static final String PARAM_HELP = "help";
 
@@ -86,6 +87,7 @@ public class Cli {
     private static boolean validateSignature = false;
     private static String interfaceType;
     private static int verboseLevel;
+    private static boolean addGeofencingSrv = false;
 
     public static void main(String[] args) {
         versionProvider = new ClientVersionProvider();
@@ -167,7 +169,11 @@ public static void main(String[] args) {
                 request.getDataToBeSigned().setData(dtbs);
                 request.getMobileUser().setMsisdn(msisdn);
                 request.setSignatureProfile(SignatureProfiles.ANY_LOA4);
-                request.addAdditionalService(new GeofencingAdditionalService());
+
+                if (addGeofencingSrv) {
+                    request.addAdditionalService(new GeofencingAdditionalService());
+                }
+
                 request.setTrafficObserver(prettyPrinterTrafficObserver);
                 request.setUserResponseTimeOutInSeconds(requestTimeout);
 
@@ -355,6 +361,10 @@ private static void parseArguments(String[] args) {
                     validateSignature = true;
                     break;
                 }
+                case PARAM_GEO: {
+                    addGeofencingSrv = true;
+                    break;
+                }
                 case PARAM_MSISDN: {
                     if (argValue == null) {
                         if (argIndex + 1 < args.length) {

mid-java-client-usage/src/main/java/ch/swisscom/mid/client/samples/Utils.java

@@ -43,6 +43,7 @@ public static ClientConfiguration buildClientConfig() {
         tls.setTrustStoreFile("/home/localuser/truststore.jks");
         tls.setTrustStorePassword("secret");
         tls.setHostnameVerification(true);
+        tls.setSslContext("TLSv1.2");
 
         HttpConfiguration http = config.getHttp();
         http.setConnectionTimeoutInMs(20 * 1000);

mid-java-client-usage/src/main/resources/cli-files/config-sample.properties

@@ -5,7 +5,7 @@ client.keyStore.file=keystore.jks
 client.keyStore.password=secret
 client.keyStore.keyPassword=secret
 client.keyStore.certAlias=my-cert-alias
-client.tls.sslContext=SSLv3
+client.tls.sslContext=TLSv1.2
 # --
 client.http.connectionTimeoutInSeconds=20
 client.http.responseTimeoutInSeconds=100

mid-java-client-usage/src/main/resources/cli-files/usage.txt

@@ -22,6 +22,8 @@ Arguments:
 
     -receipt                                            - For sign operation. Send a receipt after the signature is acquired successfully
 
+    -geofencing                                         - For sign operation. Request additional geofencing data
+
     -validate                                           - For sign operation. Validate the signature once it is successfully acquired
 
     -msisdn=41790000000                                 - The target MSISDN for the chosen operation
@@ -59,7 +61,7 @@ Use cases:
     - ./bin/mid-client.sh -sign -sync -receipt -msisdn=41790000000 -lang=en -dtbs="Do you want to login?" -soap -vv
     - ./bin/mid-client.sh \
            -config=my-config.properties \
-           -sign -sync -receipt \
+           -sign -sync -receipt -geofencing \
            -msisdn=41790000000 \
            -lang=en -dtbs="Do you want to login?" \
            -soap -vv