Fix for uploading data packages from iTAK

Author: brian7704

opentakserver/blueprints/marti_api/data_package_marti_api.py

@@ -26,23 +26,57 @@
 data_package_marti_api = Blueprint("data_package_marti_api", __name__)
 
 
+def save_data_package_file(file, filename: str = None, username: str = None, eud_uid: str = None):
+    file_hash = request.args.get("hash")
+    if not file_hash:
+        sha256 = hashlib.sha256()
+        if type(file) == bytes:
+            sha256.update(file)
+            file_hash = sha256.hexdigest()
+            filename, extension = os.path.splitext(secure_filename(filename))
+            with open(os.path.join(app.config.get("UPLOAD_FOLDER"), f"{file_hash}.zip"), "wb") as f:
+                f.write(file)
+        else:
+            sha256.update(file.stream.read())
+            file.stream.seek(0)
+            file_hash = sha256.hexdigest()
+            file.save(os.path.join(app.config.get("UPLOAD_FOLDER"), f"{file_hash}.zip"))
+            filename, extension = os.path.splitext(secure_filename(file.filename))
+            logger.debug("Got file: {} - {}".format(file.filename, file_hash))
+
+    file_size = os.path.getsize(os.path.join(app.config.get("UPLOAD_FOLDER"), f"{file_hash}.zip"))
+    save_data_package_to_db(
+        f"{filename}.zip", file_hash, "application/x-zip-compressed", file_size, username, eud_uid
+    )
+
+    return file_hash
+
+
 def save_data_package_to_db(
     filename: str = None,
     sha256_hash: str = None,
     mimetype: str = "application/zip",
     file_size: int = 0,
+    username: str = None,
+    eud_uid: str = None,
 ):
     try:
         data_package = DataPackage()
         data_package.filename = filename
         data_package.hash = sha256_hash
-        data_package.creator_uid = (
-            request.args.get("creatorUid") if request.args.get("creatorUid") else None
-        )
+        data_package.creator_uid = request.args.get("CreatorUid")  # iTAK
+        data_package.creator_uid = request.args.get("creatorUid")  # All other TAK clients
         data_package.submission_user = current_user.id if current_user.is_authenticated else None
         data_package.submission_time = datetime.now(timezone.utc)
         data_package.mime_type = mimetype
         data_package.size = file_size
+        data_package.creator_uid = eud_uid
+
+        if username:
+            user = app.security.datastore.find_user(username=username)
+            if user:
+                data_package.submission_user = user.id
+
         db.session.add(data_package)
         db.session.commit()
     except sqlalchemy.exc.IntegrityError as e:
@@ -169,25 +203,8 @@ def data_package_share():
 
         if extension != "zip":
             file_hash = create_data_package_zip(file)
-
         else:
-            file_hash = request.args.get("hash")
-            if not file_hash:
-                sha256 = hashlib.sha256()
-                sha256.update(file.stream.read())
-                file.stream.seek(0)
-                file_hash = sha256.hexdigest()
-                logger.debug("got sha256 {}".format(file_hash))
-
-            logger.debug("Got file: {} - {}".format(file.filename, file_hash))
-
-            file.save(os.path.join(app.config.get("UPLOAD_FOLDER"), f"{file_hash}.zip"))
-
-            filename, extension = os.path.splitext(secure_filename(file.filename))
-            file_size = os.path.getsize(
-                os.path.join(app.config.get("UPLOAD_FOLDER"), f"{file_hash}.zip")
-            )
-            save_data_package_to_db(f"{filename}.zip", file_hash, file.content_type, file_size)
+            file_hash = save_data_package_file(file)
 
         url = urlparse(request.url_root)
         return (

opentakserver/blueprints/marti_api/mission_marti_api.py

@@ -22,6 +22,7 @@
 from sqlalchemy import insert, or_, update
 from werkzeug.utils import secure_filename
 
+from opentakserver.blueprints.marti_api.data_package_marti_api import save_data_package_file
 from opentakserver.blueprints.marti_api.marti_api import verify_client_cert
 from opentakserver.extensions import db, logger
 from opentakserver.functions import datetime_from_iso8601_string, iso8601_string_from_datetime
@@ -1697,11 +1698,30 @@ def upload_content():
     if not file_name:
         return jsonify({"success": False, "error": gettext("File name cannot be blank")}), 400
 
-    filename, extension = os.path.splitext(secure_filename(file_name))
+    # When uploading data packages, iTAK doesn't include an extension. If the user agent is iTAK and
+    # the content type is zip, assume that iTAK is uploading a data package
+    if (
+        "iTAK" in request.user_agent.string
+        and request.content_type == "application/x-zip-compressed"
+    ):
+        file_hash = save_data_package_file(
+            request.data, secure_filename(file_name) + ".zip", username, creator_uid
+        )
+
+        response = {
+            "UID": str(uuid.uuid4()),
+            "SubmissionDateTime": iso8601_string_from_datetime(),
+            "MIMEType": "application/x-zip-compressed",
+            "SubmissionUser": username,
+            "PrimaryKey": 0,
+            "Hash": file_hash,
+            "CreatorUid": creator_uid,
+            "Name": file_name,
+        }
+
+        return jsonify(response)
 
-    # In some cases iTAK doesn't include the file extension. If the user agent includes iTAK and there's no extension we'll assume it's a zip
-    if not extension and "iTAK" in request.user_agent.string:
-        extension = "zip"
+    filename, extension = os.path.splitext(secure_filename(file_name))
 
     if extension.replace(".", "").lower() not in app.config.get("ALLOWED_EXTENSIONS"):
         logger.error(f"{extension} is not an allowed file extension")

opentakserver/functions.py

@@ -142,11 +142,11 @@ def datetime_from_iso8601_string(datetime_string: str | None) -> datetime:
         return dt
 
 
-def iso8601_string_from_datetime(datetime_object):
+def iso8601_string_from_datetime(datetime_object: datetime | None = None) -> str:
     if datetime_object:
         return datetime_object.strftime("%Y-%m-%dT%H:%M:%S.%f")[:-2] + "Z"
     else:
-        return None
+        return datetime.now(timezone.utc).strftime("%Y-%m-%dT%H:%M:%S.%f")[:-2] + "Z"
 
 
 def iso8601_string_from_datetime_no_ms(datetime_object):