Working version pipeline

Author: StarGate01

.drone.yml

@@ -8,6 +8,11 @@ clone:
 workspace:
   path: /app/src
 
+volumes:
+- name: cache
+  temp:
+    medium: memory
+
 steps:
 - name: clone
   image: alpine/git
@@ -18,10 +23,16 @@ steps:
   image: stargate01/smartcard-ci
   commands:
   - /app/src/scripts/compile-all.sh
+  volumes:
+  - name: cache
+    path: /tmp
 - name: test  
   image: stargate01/smartcard-ci
   commands:
   - /app/src/scripts/test-all.sh
+  volumes:
+  - name: cache
+    path: /tmp
 - name: publish
   image: plugins/github-release
   settings:

README.md

@@ -15,3 +15,7 @@ Public compiled binaries are available from the GitHub releases page: https://gi
 ## Development Usage
 
 Install Docker. Use the `docker-*.sh` scripts in `scripts/` to compile and test the applets. Binaries will be placed in `bin/`. This repository also runs on a Drone CI server.
+
+## Version Command
+
+The build system in this repository adds an extra version APDU command to each applet. See `scripts/compile/res/version.py`. Use this build system if you want to generate release equivalent binaries.

scripts/compile/res/compile.sh

@@ -10,14 +10,11 @@ prepare_build() {
 }
 
 patch_version() {
-    git config --global --add safe.directory /app/src
-    cd /app/src
-    TAG=`git tag --points-at HEAD`
     SRC="$BUILD/build.xml"
     if [ ! -f $SRC ]; then
         SRC="$BUILD/build.gradle"
     fi
-    /app/src/scripts/compile/res/version.py -s $SRC -p $1 -v $TAG
+    /app/src/scripts/compile/res/version.py -s $SRC -p $1 -v $DRONE_TAG
 }
 
 build_default() {

scripts/compile/res/version.py

@@ -12,34 +12,68 @@
     parser.add_argument('-v', '--version', nargs='?', dest='version', type=str, 
         const='255.255.255', default='255.255.255', help='Build version to encode')
     args = parser.parse_args()
-
     version = args.version.strip('v')
-
-    print('Patching file ' + args.patch + ' using the applet version from ' + args.source + ' and the additional build version ' + version)
+    print('info: Patching file: ' + args.patch)
+    print('info: Applet version from: ' + args.source)
+    print('info: Additional build version: ' + version)
 
+    # Parse version source file
+    _, ext = os.path.splitext(args.source)
     if(not os.path.isfile(args.source)):
         print('error: source file ' + args.source + 'does not exist')
         exit(1)
-    
-    # Parse version source file
-    _, ext = os.path.splitext(args.source)
     with open(args.source, 'r') as f:
         config = f.read()
     if(ext == '.xml'):
         # Ant XML file
-        matches = re.findall("cap.*version[\s='\"]*([^\s'\"]*)", config, flags=re.DOTALL)
+        matches = re.search("cap.*version[\s='\"]*([^\s'\"]*)", config, flags=re.DOTALL)
     elif(ext == '.gradle'):
         # Gradle config
-        matches = re.findall("javacard {.*version[\s=']*([^\s']*)", config, flags=re.DOTALL)
+        matches = re.search("javacard {.*version[\s=']*([^\s']*)", config, flags=re.DOTALL)
     else:
         print('error: Unknown source file format: ' + ext)
-
-    if(len(matches) == 0):
+    if(matches == None):
         print("error: Cannot find version in config file")
         exit(1)
-    appversion = matches[0]
-    print("info: Found source version: " + appversion)
+    appversion = matches.group(1)
+    print("info: Found applet version: " + appversion)
+
+    # Generate patch
+    appversion = appversion.split('.')
+    version = version.split('.')
+    patch = '''
+        byte[] ver_buf = apdu.getBuffer();
+        if(ver_buf[ISO7816.OFFSET_INS] == (byte) 0xF4 && ver_buf[ISO7816.OFFSET_P1] == (byte) 0x99 && ver_buf[ISO7816.OFFSET_P2] == (byte) 0x99) {{
+            short ver_le = apdu.setOutgoing();
+            short ver_len = (short) 5;
+            ver_len = ver_le > (short) 0 ? (ver_le > ver_len ? ver_len : ver_le) : ver_len;
+            ver_buf[0] = (byte) {};
+            ver_buf[1] = (byte) {};
+            ver_buf[2] = (byte) {};
+            ver_buf[3] = (byte) {};
+            ver_buf[4] = (byte) {};
+            apdu.setOutgoingLength(ver_len);
+            apdu.sendBytes((short) 0, ver_len);
+            ver_buf = null;
+            return;
+        }} else {{
+            ver_buf = null;
+        }}
+    '''.format(appversion[0], appversion[1], version[0], version[1], version[2])
 
+    # Find patch location and apply patch
     if(not os.path.isfile(args.patch)):
         print('error: patch file ' + args.patch + 'does not exist')
         exit(1)
+    with open(args.patch, 'r') as f:
+        patchtarget = f.read()
+    match = re.search("void\s*process\s*\((?:final)?\s*APDU apdu\)\s*(?:throws ISOException)?\s*{", patchtarget, flags=re.DOTALL)
+    if(match == None):
+        print("error: Cannot find process method in patch file")
+        exit(1)
+    offset = match.end()
+    patchtarget = patchtarget[:offset] + patch + patchtarget[offset:]
+    with open(args.patch, 'w') as f:
+        f.write(patchtarget)
+
+    print("info: Done patching")