[script] added helper script to avoid code duplication; removed unnee…

…ded scripts.

script/build-docker-image.sh

@@ -29,16 +29,8 @@
 
 set -e
 
-## This is not a public repository, make sure you have the access!
-readonly TRI_REPO=git@bitbucket.org:threadgroup/tce-registrar-java.git
-
 readonly IMAGE_NAME=ot-registrar
 
-if [ ! -d tri ]; then
-    echo "cloning 'tce-registrar-java' into 'tri'..."
-    git clone $TRI_REPO tri
-fi
-
 # Enable ipv6
 if [ ! -f /etc/docker/daemon.json ]; then
     echo "enabling ipv6 for docker ..."

script/cose-validator.sh

@@ -27,4 +27,4 @@
 #  POSSIBILITY OF SUCH DAMAGE.
 #
 
-java -cp target/ot-registrar-0.1-SNAPSHOT-jar-with-dependencies.jar com.google.openthread.tools.CoseValidator $1 $2
+./script/helper-cp-run.sh com.google.openthread.tools.CoseValidator $@

script/create-keystore-ietf-draft-constrained-brski.sh

@@ -1,9 +1,36 @@
  #!/bin/bash
+#
+#  Copyright (c) 2022, The OpenThread Registrar Authors.
+#  All rights reserved.
+#
+#  Redistribution and use in source and binary forms, with or without
+#  modification, are permitted provided that the following conditions are met:
+#  1. Redistributions of source code must retain the above copyright
+#     notice, this list of conditions and the following disclaimer.
+#  2. Redistributions in binary form must reproduce the above copyright
+#     notice, this list of conditions and the following disclaimer in the
+#     documentation and/or other materials provided with the distribution.
+#  3. Neither the name of the copyright holder nor the
+#     names of its contributors may be used to endorse or promote products
+#     derived from this software without specific prior written permission.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+#  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+#  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+#  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+#  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+#  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+#  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+#  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+#  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+#  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+#  POSSIBILITY OF SUCH DAMAGE.
+#
  CREDS=./credentials/ietf-draft-constrained-brski
  echo "Creating .p12 keystore file for credentials in $CREDS ..."
- java -cp target/ot-registrar-0.1-SNAPSHOT-jar-with-dependencies.jar com.google.openthread.tools.CredentialGenerator \
+ ./script/helper-cp-run.sh com.google.openthread.tools.CredentialGenerator \
               -c $CREDS/domain_ca.pem $CREDS/privkey_domain_ca.pem \
               -r $CREDS/registrar.pem $CREDS/privkey_registrar.pem \
               -m $CREDS/masa_ca.pem $CREDS/privkey_masa_ca.pem \
               -p $CREDS/pledge.pem $CREDS/privkey_pledge.pem \
-              -o ./credentials/keystore_ietf-draft-constrained-brski.p12
+              -o ./credentials/keystore_ietf-draft-constrained-brski.p12

script/create-pledge-credentials-p12-honeydukes.sh

@@ -29,14 +29,8 @@
 
 # This script is to run the Java Pledge with Honeydukes IDevID.
 # The Honeydukes test vendor/MASA is located at: https://honeydukes.sandelman.ca/
-readonly JAR_FILE=./target/ot-registrar-0.1-SNAPSHOT-jar-with-dependencies.jar
+
 readonly CREDENTIAL=./credentials/honeydukes/credentials.p12
 readonly CRED_DIR=./credentials/honeydukes
 
-# test if build JAR exists
-if [ ! -f  "${JAR_FILE}" ]; then
-  echo "Please build using 'mvn -DskipTests package' before running; and run this script from base directory of repo."
-  exit 1
-fi
-
-java -cp $JAR_FILE com.google.openthread.tools.CredentialGenerator -m $CRED_DIR/vendor.crt -p $CRED_DIR/device.crt $CRED_DIR/key.pem -o $CREDENTIAL
+./script/helper-cp-run.sh com.google.openthread.tools.CredentialGenerator -m $CRED_DIR/vendor.crt -p $CRED_DIR/device.crt $CRED_DIR/key.pem -o $CREDENTIAL

script/create-pledge-credentials-p12-iotconsultancy.sh

@@ -28,17 +28,10 @@
 #
 
 # This script is to run the Java Pledge with IoTconsultancy IDevID.
-readonly JAR_FILE=./target/ot-registrar-0.1-SNAPSHOT-jar-with-dependencies.jar
 readonly CRED_DIR=./credentials/iotconsultancy-masa
 readonly CREDENTIAL=${CRED_DIR}/credentials.p12
 
-# test if build JAR exists
-if [ ! -f  "${JAR_FILE}" ]; then
-  echo "Please build using 'mvn -DskipTests package' before running; and run this script from base directory of repo."
-  exit 1
-fi
-
-java -cp $JAR_FILE com.google.openthread.tools.CredentialGenerator \
+./script/helper-cp-run.sh com.google.openthread.tools.CredentialGenerator \
    -ms $CRED_DIR/TestVendor_masa.pem $CRED_DIR/privkey_TestVendor_masa.pem \
    -m $CRED_DIR/TestVendor_masa_ca.pem $CRED_DIR/privkey_TestVendor_masa_ca.pem \
    -p $CRED_DIR/TestVendor_1.pem $CRED_DIR/privkey_TestVendor_1.pem \

script/create-pledge-credentials-p12.sh

@@ -27,14 +27,7 @@
 #  POSSIBILITY OF SUCH DAMAGE.
 #
 
-readonly JAR_FILE=./target/ot-registrar-0.1-SNAPSHOT-jar-with-dependencies.jar
 readonly CREDENTIAL=./credentials/pledge_credentials.p12
 readonly CRED_DIR=./credentials/local-masa
 
-# test if build JAR exists
-if [ ! -f  "${JAR_FILE}" ]; then
-  echo "Please build using 'mvn -DskipTests package' before running; and run this script from base directory of repo."
-  exit 1
-fi
-
-java -cp $JAR_FILE com.google.openthread.tools.CredentialGenerator -m $CRED_DIR/masa_cert.pem $CRED_DIR/masa_private.pem -p $1 $2 -o $CREDENTIAL
+./script/helper-cp-run.sh com.google.openthread.tools.CredentialGenerator -m $CRED_DIR/masa_cert.pem $CRED_DIR/masa_private.pem -p $1 $2 -o $CREDENTIAL

script/run-pledge-localhost.sh → script/helper-cp-run.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-#  Copyright (c) 2019, The OpenThread Registrar Authors.
+#  Copyright (c) 2024, The OpenThread Registrar Authors.
 #  All rights reserved.
 #
 #  Redistribution and use in source and binary forms, with or without
@@ -27,4 +27,12 @@
 #  POSSIBILITY OF SUCH DAMAGE.
 #
 
-java -cp target/ot-registrar-0.1-SNAPSHOT-jar-with-dependencies.jar com.google.openthread.pledge.PledgeMain -f ./credentials/local-masa/test_credentials.p12 -r coaps://localhost
+readonly JAR_FILE=./target/ot-registrar-0.2-jar-with-dependencies.jar
+
+# test if OT Registrar JAR exists
+if [ ! -f  "${JAR_FILE}" ]; then
+  echo "Please build using 'mvn -DskipTests package' before running."
+  exit 1
+fi
+
+java -cp $JAR_FILE $@

script/recreate-ot-registrar-cert.sh

@@ -1,4 +1,32 @@
 #!/bin/bash
+#
+#  Copyright (c) 2021, The OpenThread Registrar Authors.
+#  All rights reserved.
+#
+#  Redistribution and use in source and binary forms, with or without
+#  modification, are permitted provided that the following conditions are met:
+#  1. Redistributions of source code must retain the above copyright
+#     notice, this list of conditions and the following disclaimer.
+#  2. Redistributions in binary form must reproduce the above copyright
+#     notice, this list of conditions and the following disclaimer in the
+#     documentation and/or other materials provided with the distribution.
+#  3. Neither the name of the copyright holder nor the
+#     names of its contributors may be used to endorse or promote products
+#     derived from this software without specific prior written permission.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+#  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+#  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+#  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+#  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+#  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+#  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+#  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+#  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+#  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+#  POSSIBILITY OF SUCH DAMAGE.
+#
+
 # Recreate the cert for: OT Registrar (RA)
 # signed by root=domainCA
 

script/recreate-test-credentials-p12.sh

@@ -27,14 +27,11 @@
 #  POSSIBILITY OF SUCH DAMAGE.
 #
 
-readonly JAR_FILE=./target/ot-registrar-0.1-SNAPSHOT-jar-with-dependencies.jar
 readonly CREDENTIAL=./credentials/local-masa/test_credentials.p12
 readonly CRED_DIR=./credentials/local-masa
 
-# test if build JAR exists
-if [ ! -f  "${JAR_FILE}" ]; then
-  echo "Please build using 'mvn -DskipTests package' before running; and run this script from base directory of repo."
-  exit 1
-fi
-
-java -cp $JAR_FILE com.google.openthread.tools.CredentialGenerator -c $CRED_DIR/domainca_cert.pem $CRED_DIR/domainca_private.pem -m $CRED_DIR/masa_cert.pem $CRED_DIR/masa_private.pem -r $CRED_DIR/registrar_cert.pem $CRED_DIR/registrar_private.pem -o $CREDENTIAL
+./script/helper-cp-run.sh com.google.openthread.tools.CredentialGenerator \
+    -c $CRED_DIR/domainca_cert.pem $CRED_DIR/domainca_private.pem \
+    -m $CRED_DIR/masa_cert.pem $CRED_DIR/masa_private.pem \
+    -r $CRED_DIR/registrar_cert.pem $CRED_DIR/registrar_private.pem \
+    -o $CREDENTIAL

script/run

@@ -29,7 +29,7 @@
 
 readonly JAR_FILE=./target/ot-registrar-0.2-jar-with-dependencies.jar
 
-# test if Registrar JAR exists
+# test if OT Registrar JAR exists
 if [ ! -f  "${JAR_FILE}" ]; then
   echo "Please build using 'mvn -DskipTests package' before running."
   exit 1

script/run-pledge-honeydukes.sh

@@ -30,4 +30,5 @@
 # This runs a Pledge using Honeydukes IDevID, onboarding via cloud Registrar.
 # The script create-pledge-credentials-p12-honeydukes.sh can be used to create 
 # or recreate the credentials file.
-java -cp target/ot-registrar-0.1-SNAPSHOT-jar-with-dependencies.jar com.google.openthread.pledge.PledgeMain -f ./credentials/honeydukes/credentials.p12 -r coaps://masa.iotconsultancy.nl
+
+./script/run -pledge -f ./credentials/honeydukes/credentials.p12 -r coaps://masa.iotconsultancy.nl

script/run-pledge-iotconsultancy.sh

@@ -37,4 +37,4 @@ if [ "$#" -eq 1 ]; then
 fi
 
 echo "Pledge using IoTconsultancy credentials with Registrar: ${REGISTRAR}"
-java -cp target/ot-registrar-0.1-SNAPSHOT-jar-with-dependencies.jar com.google.openthread.pledge.PledgeMain -f ./credentials/iotconsultancy-masa/credentials.p12 -r ${REGISTRAR}
+./script/run -pledge -f ./credentials/iotconsultancy-masa/credentials.p12 -r ${REGISTRAR}