Upgrade deps, support for percent-coded form ids

Dockerfile

@@ -1,9 +1,9 @@
-FROM python:3.8-alpine
+FROM python:3.9-alpine
 
 COPY requirements.txt /tmp/ 
 RUN pip install --requirement /tmp/requirements.txt
 
-RUN apk --update add openjdk8-jre-base
+RUN apk --update add openjdk11-jre-headless
 
 COPY ./app /app
 WORKDIR /app

README.md

@@ -3,7 +3,7 @@ pyxform-http is a Flask-based web service that uses pyxform to convert a XLSForm
 
 # Install requirements
 * Python 3
-* Java
+* Java 11
 
 # Run locally
 ```
@@ -47,4 +47,9 @@ curl --request POST --header "X-XlsForm-FormId-Fallback: external-choices" --dat
 A form that converts successfully (with no id)
 ```
 curl --request POST --data-binary @test/pyxform-clean.xlsx http://127.0.0.1:5000/api/v1/convert
+```
+
+A form that converts successfully (with percent encoded id)
+```
+curl --request POST --header "X-XlsForm-FormId-Fallback: example%40example.org"  --data-binary @test/pyxform-clean.xlsx http://127.0.0.1:5000/api/v1/convert
 ```

app/main.py

@@ -7,6 +7,7 @@
 from flask import Flask, jsonify, request, escape
 from pyxform import xls2xform
 from uuid import uuid4 as uuid
+from urllib.parse import unquote
 
 
 def app():
@@ -23,9 +24,10 @@ def post():
         xlsform_formid_fallback_header = request.headers.get(
             "X-XlsForm-FormId-Fallback"
         )
-        xlsform_formid_fallback = str(uuid())
-        if xlsform_formid_fallback_header != None:
+        if xlsform_formid_fallback_header is not None:
             xlsform_formid_fallback = sanitize(xlsform_formid_fallback_header)
+        else:
+            xlsform_formid_fallback = str(uuid())
 
         with TemporaryDirectory() as temp_dir_name:
             try:
@@ -74,7 +76,7 @@ def post():
 
 
 def sanitize(string):
-    return os.path.basename(escape(string))
+    return os.path.basename(escape(unquote(string)))
 
 
 def response(status=400, result=None, itemsets=None, warnings=None, error=None):
@@ -84,7 +86,7 @@ def response(status=400, result=None, itemsets=None, warnings=None, error=None):
             result=result,
             itemsets=itemsets,
             warnings=warnings,
-            error=error,
+            error=error
         ),
         status,
     )

requirements.txt

@@ -1,3 +1,3 @@
 Flask==1.1.2
-waitress==1.4.4
+waitress==2.0.0
 pyxform==1.4.0