updates

main.py

@@ -60,6 +60,7 @@ def generate_image(prompt, model):
         [
             "./scripts/sign.sh",
             filename,
+            filename,
             "--assertions-inline",
             json_object
         ]
@@ -68,7 +69,7 @@ def generate_image(prompt, model):
     subprocess.check_output(
         [
             "cp",
-            "output.jpg",
+            filename,
             "static/" + filename,
         ]
     )
@@ -81,7 +82,6 @@ def verify_image(fileUpload: UploadFile):
     logging.warning("in verify")
     logging.warning(fileUpload.filename)
 
-
     # check if the file has been uploaded
     if fileUpload.filename:
         # strip the leading path from the file name
@@ -90,10 +90,14 @@ def verify_image(fileUpload: UploadFile):
         # open read and write the file into the server
         open(fn, "wb").write(fileUpload.file.read())
 
+        fileupload_extension = file_extension(fileUpload.filename)
+        filename = str(uuid.uuid4()) + "." + fileupload_extension
+
         response = subprocess.check_output(
             [
                 "./scripts/verify.sh",
                 fileUpload.filename,
+                filename
             ]
         )
 
@@ -114,9 +118,6 @@ def verify_image(fileUpload: UploadFile):
         original_media = original_media[1].strip(" ").strip("'")
 
         if c2pa == 'true':
-            fileupload_extension = file_extension(fileUpload.filename)
-            filename = str(uuid.uuid4()) + "." + fileupload_extension
-            
             response = subprocess.check_output(
                 [
                     "cp",

scripts/sign.sh

@@ -12,8 +12,9 @@ debug_echo() {
     fi
 }
 
-
 MEDIA_FILE=$(readlink -f "$1")
+OUTPUT_FILE=$2
+shift
 shift
 
 TRUEPIC_CLI=/home/user/app/truepic
@@ -128,7 +129,7 @@ debug_echo
 debug_echo -n "Re-signing the watermarked media..."
 ${TRUEPIC_CLI} sign --profile steg ${watermarked_image} \
     --ingredient-manifest-store ${no_watermark_manifest} \
-    --output output.${extension} \
+    --output "${OUTPUT_FILE}" \
     --assertions-inline '{
         "assertions": [
           {
@@ -148,13 +149,13 @@ ${TRUEPIC_CLI} sign --profile steg ${watermarked_image} \
           }
         ]
       }' > /dev/null 2>&1
-debug_echo " --> output.${extension}"
+debug_echo " --> ${OUTPUT_FILE}"
 rm -f ${no_watermark_manifest}
 
 debug_echo
 debug_echo -n "Extracting new manifest..."
 with_watermark_manifest=$(mktemp).bin
-${TRUEPIC_CLI} manifest extract output.${extension} --output ${with_watermark_manifest} > /dev/null 2>&1
+${TRUEPIC_CLI} manifest extract "${OUTPUT_FILE}" --output ${with_watermark_manifest} > /dev/null 2>&1
 debug_echo " --> ${with_watermark_manifest}"
 
 debug_echo

scripts/verify.sh

@@ -13,6 +13,7 @@ debug_echo() {
 }
 
 MEDIA_FILE=$(readlink -f "$1")
+OUTPUT_FILE=$2
 
 TRUEPIC_CLI=/home/user/app/truepic
 STEG_SCRIPTS=/home/user/app/scripts/
@@ -123,14 +124,14 @@ debug_echo " --> ${downloaded_manifest}"
 
 debug_echo
 debug_echo -n "Inserting new manifest into media file..."
-${TRUEPIC_CLI} manifest insert ${downloaded_manifest} ${downloaded_original} --output watermarked_original.${extension} > /dev/null 2>&1
-debug_echo " --> watermarked_original.${extension}"
+${TRUEPIC_CLI} manifest insert ${downloaded_manifest} ${downloaded_original} --output "${OUTPUT_FILE}" > /dev/null 2>&1
+debug_echo " --> ${OUTPUT_FILE}"
 rm -f ${downloaded_original}
 rm -f ${downloaded_manifest}
 
 debug_echo
 debug_echo "Checking the manifest."
-verification_json=$(${TRUEPIC_CLI} verify watermarked_original.${extension})
+verification_json=$(${TRUEPIC_CLI} verify "${OUTPUT_FILE}")
 
 hash_status=$(
   echo "${verification_json}" | \
@@ -162,12 +163,14 @@ public_key=$(
 )
 
 debug_echo -n "Checking watermark signature... ${thumbnail_hash}|${timestamp} ... ${watermark_signature} ..."
+set +e
 signature_verification=$(
   openssl dgst -sha256 \
     -verify <(echo "${public_key}") \
     -signature <(echo "${watermark_signature}" | base64 -d) \
     <(echo "${thumbnail_hash}|${timestamp}")
 )
+set -e
 
 if [ "${signature_verification}" != "Verified OK" ]; then
   debug_echo " FAILED"
@@ -183,8 +186,8 @@ if [ "$hash_status" = "VALID" ]; then
 
   echo "Contains C2PA manifest: ${c2pa_manifest_found}"
   echo "Contains watermark: true"
-  echo "Original watermarked media: watermarked_original.${extension}"
+  echo "Original watermarked media: ${OUTPUT_FILE}"
   exit 0
 fi
 debug_echo " hashes DON'T match!"
-rm -f watermarked_original.${extension}
+rm -f "${OUTPUT_FILE}"

static/index.html

@@ -89,8 +89,8 @@
               <div class="alert alert-secondary action-menu" role="alert">
                 <div class="row">
                   <div class="col">
-                    <p><strong>Non consectetur erat in non et in?</strong></p>
-                    <p>Ornare a est accumsan et platea quis rhoncus.</p>
+                    <p class="mb-0"><strong>Non consectetur erat in non et in?</strong></p>
+                    <p class="mb-0">Ornare a est accumsan et platea quis rhoncus.</p>
                   </div>
                   <div class="col flex-grow-0">
                     <a id="download-button" class="btn btn-outline-primary"

static/style.css

@@ -156,6 +156,11 @@ img.thumbnail {
 
 .action-menu {
   display: none;
+  margin: 2rem 2rem 0 0;
+}
+
+.action-menu .row {
+  align-items: center;
 }
 
 .action-menu button,