Improved error reporting if TSA url does not reply with timestamp response.

Corrected simplified merkle-tree schematic.
This commit is contained in:
Matthias Bühlmann committed 2021-02-17 21:49:59 +01:00
1 parent 208ff5164c
commit 0ed310cf9a
2 files changed
+7 -2

No files matched your search

+2 -2
View File
@@ -1,4 +1,4 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" height="1409.9999999999982pt" width="680pt" viewBox="-915 787 688 1415.9999999999982"><defs><style type="text/css"> <svg xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" height="1910.000000000001pt" width="683.9999999999992pt" viewBox="-914.9999999999999 277 691.9999999999992 1916.000000000001"><defs><style type="text/css">
@font-face { @font-face {
font-family: 'lt_bold'; font-family: 'lt_bold';
src: url('https://app.creately.com/diagram/assets/fonts/lato/lt-bold-webfont.woff2') format('woff2'), src: url('https://app.creately.com/diagram/assets/fonts/lato/lt-bold-webfont.woff2') format('woff2'),
@@ -169,4 +169,4 @@
} }
</style></defs><defs><style> </style></defs><defs><style>
span{ display: inline-block; } span{ display: inline-block; }
</style></defs><g id="anzRlI7v2S8"><g transform="translate(-910 790)"><path d="M 10,0 L 270.0000000000003,0 L 270.0000000000003,0 L 270.0000000000003,0 A 10 10 0 0 1 280.0000000000003 10 L 280.0000000000003,160 L 280.0000000000003,160 L 280.0000000000003,160 A 10 10 0 0 1 270.0000000000003 170 L 10,170 L 10,170 L 10,170 A 10 10 0 0 1 0 160 L 0,10 L 0,10 L 0,10.000000000000002 A 10 10 0 0 1 10 0 Z" fill="rgb(143,209,243)" stroke="#62B7E2" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" stroke-dasharray="0 0"/></g><g transform="translate(-805.2499999999999, 856.75) rotate(0, 35.25, 18.25)" width="70.5" height="36.5"><text text-decoration="none" x="0" fill="#ffffff" font-size="20pt" font-family="noto_regular" y="28.5">HEAD</text><text text-decoration="none" x="70.5" fill="#4b4b4b" font-size="10pt" font-family="noto_regular" y="28.5"></text></g></g><g id="PQ8n5PCICiC"><g transform="translate(-909.9999999999991 1979.9999999999975)"><path d="M 10,0 L 269.99999999999955,0 L 269.99999999999955,0 L 269.99999999999955,0 A 10 10 0 0 1 279.99999999999955 10 L 279.99999999999955,149.99999999999994 L 279.99999999999955,149.99999999999994 L 279.99999999999955,149.99999999999994 A 10 10 0 0 1 269.99999999999955 159.99999999999994 L 10,159.99999999999994 L 10,159.99999999999994 L 10,159.99999999999994 A 10 10 0 0 1 0 149.99999999999994 L 0,10 L 0,10 L 0,10.000000000000002 A 10 10 0 0 1 10 0 Z" fill="rgb(143,209,243)" stroke="#62B7E2" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" stroke-dasharray="0 0"/></g><g transform="translate(-819.4999999999993, 2041.7499999999973) rotate(0, 49.5, 18.25)" width="99" height="36.5"><text text-decoration="none" x="0" fill="#FFFFFF" font-weight="bold" font-size="20pt" font-family="noto_regular" y="28.5">Commit</text><text text-decoration="none" x="99" fill="#4b4b4b" font-size="10pt" font-family="noto_regular" y="28.5"></text></g></g><g id="VcXVbh4MTSX"><g transform="translate(-899.9999999999989 1989.9999999999966)"><path d="M 10,0 L 76,0 L 76,0 L 76,0 A 10 10 0 0 1 86 10 L 86,34.5 L 86,34.5 L 86,34.5 A 10 10 0 0 1 76 44.5 L 10,44.5 L 10,44.5 L 10,44.5 A 10 10 0 0 1 0 34.5 L 0,10 L 0,10 L 0,10.000000000000002 A 10 10 0 0 1 10 0 Z" fill="rgb(254,190,50)" stroke="#BB881A" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" stroke-dasharray="0 0"/></g><g transform="translate(-862.4999999999989, 1999.9999999999966) rotate(0, 5.5, 12.25)" width="11" height="24.5"><text text-decoration="none" x="0" fill="#ffffff" font-weight="bold" font-size="14pt" font-family="courier_prime" y="16.5">#</text><text text-decoration="none" x="11" fill="#4b4b4b" font-size="10pt" font-family="noto_regular" y="16.5"></text></g></g><g id="oH8SfKF6paE"><g transform="translate(-909.9999999999991 1679.9999999999984)"><path d="M 10,0 L 269.99999999999955,0 L 269.99999999999955,0 L 269.99999999999955,0 A 10 10 0 0 1 279.99999999999955 10 L 279.99999999999955,149.99999999999977 L 279.99999999999955,149.99999999999977 L 279.99999999999955,149.99999999999977 A 10 10 0 0 1 269.99999999999955 159.99999999999977 L 10,159.99999999999977 L 10,159.99999999999977 L 10,159.99999999999977 A 10 10 0 0 1 0 149.99999999999977 L 0,10 L 0,10 L 0,10.000000000000002 A 10 10 0 0 1 10 0 Z" fill="rgb(177,197,133)" stroke="#749032" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" stroke-dasharray="0 0"/></g><g transform="translate(-839.9999999999993, 1741.7499999999982) rotate(0, 70, 18.25)" width="140" height="36.5"><text text-decoration="none" x="0" fill="#ffffff" font-weight="bold" font-size="20pt" font-family="noto_regular" y="28.5">Timestamp</text><text text-decoration="none" x="140" fill="#4b4b4b" font-size="10pt" font-family="noto_regular" y="28.5"></text></g></g><g id="t728zbunj1t"><g transform="translate(-899.9999999999993 1689.9999999999993)"><path d="M 10,0 L 76,0 L 76,0 L 76,0 A 10 10 0 0 1 86 10 L 86,34.5 L 86,34.5 L 86,34.5 A 10 10 0 0 1 76 44.5 L 10,44.5 L 10,44.5 L 10,44.5 A 10 10 0 0 1 0 34.5 L 0,10 L 0,10 L 0,10.000000000000002 A 10 10 0 0 1 10 0 Z" fill="rgb(254,190,50)" stroke="#BB881A" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" stroke-dasharray="0 0"/></g><g transform="translate(-862.4999999999993, 1699.9999999999993) rotate(0, 5.5, 12.25)" width="11" height="24.5"><text text-decoration="none" x="0" fill="#ffffff" font-weight="bold" font-size="14pt" font-family="courier_prime" y="16.5">#</text><text text-decoration="none" x="11" fill="#4b4b4b" font-size="10pt" font-family="noto_regular" y="16.5"></text></g></g><g id="PUA9YkyAZa8"><g transform="translate(-909.9999999999991 1379.9999999999995)"><path d="M 10,0 L 269.99999999999955,0 L 269.99999999999955,0 L 269.99999999999955,0 A 10 10 0 0 1 279.99999999999955 10 L 279.99999999999955,149.99999999999977 L 279.99999999999955,149.99999999999977 L 279.99999999999955,149.99999999999977 A 10 10 0 0 1 269.99999999999955 159.99999999999977 L 10,159.99999999999977 L 10,159.99999999999977 Line truncated </style></defs><g id="anzRlI7v2S8"><g transform="translate(-909.9999999999998 280)"><path d="M 10,0 L 270.0000000000003,0 L 270.0000000000003,0 L 270.0000000000003,0 A 10 10 0 0 1 280.0000000000003 10 L 280.0000000000003,160 L 280.0000000000003,160 L 280.0000000000003,160 A 10 10 0 0 1 270.0000000000003 170 L 10,170 L 10,170 L 10,170 A 10 10 0 0 1 0 160 L 0,10 L 0,10 L 0,10.000000000000002 A 10 10 0 0 1 10 0 Z" fill="rgb(143,209,243)" stroke="#62B7E2" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" stroke-dasharray="0 0"/></g><g transform="translate(-805.2499999999997, 346.75) rotate(0, 35.25, 18.25)" width="70.5" height="36.5"><text text-decoration="none" x="0" fill="#ffffff" font-size="20pt" font-family="noto_regular" y="28.5">HEAD</text><text text-decoration="none" x="70.5" fill="#4b4b4b" font-size="10pt" font-family="noto_regular" y="28.5"></text></g></g><g id="PQ8n5PCICiC"><g transform="translate(-909.9999999999998 1970)"><path d="M 10,0 L 269.99999999999955,0 L 269.99999999999955,0 L 269.99999999999955,0 A 10 10 0 0 1 279.99999999999955 10 L 279.99999999999955,149.99999999999994 L 279.99999999999955,149.99999999999994 L 279.99999999999955,149.99999999999994 A 10 10 0 0 1 269.99999999999955 159.99999999999994 L 10,159.99999999999994 L 10,159.99999999999994 L 10,159.99999999999994 A 10 10 0 0 1 0 149.99999999999994 L 0,10 L 0,10 L 0,10.000000000000002 A 10 10 0 0 1 10 0 Z" fill="rgb(143,209,243)" stroke="#62B7E2" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" stroke-dasharray="0 0"/></g><g transform="translate(-819.5, 2031.75) rotate(0, 49.5, 18.25)" width="99" height="36.5"><text text-decoration="none" x="0" fill="#FFFFFF" font-weight="bold" font-size="20pt" font-family="noto_regular" y="28.5">Commit</text><text text-decoration="none" x="99" fill="#4b4b4b" font-size="10pt" font-family="noto_regular" y="28.5"></text></g></g><g id="VcXVbh4MTSX"><g transform="translate(-899.9999999999995 1979.999999999999)"><path d="M 10,0 L 76,0 L 76,0 L 76,0 A 10 10 0 0 1 86 10 L 86,34.5 L 86,34.5 L 86,34.5 A 10 10 0 0 1 76 44.5 L 10,44.5 L 10,44.5 L 10,44.5 A 10 10 0 0 1 0 34.5 L 0,10 L 0,10 L 0,10.000000000000002 A 10 10 0 0 1 10 0 Z" fill="rgb(254,190,50)" stroke="#BB881A" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" stroke-dasharray="0 0"/></g><g transform="translate(-862.4999999999995, 1989.999999999999) rotate(0, 5.5, 12.25)" width="11" height="24.5"><text text-decoration="none" x="0" fill="#ffffff" font-weight="bold" font-size="14pt" font-family="courier_prime" y="16.5">#</text><text text-decoration="none" x="11" fill="#4b4b4b" font-size="10pt" font-family="noto_regular" y="16.5"></text></g></g><g id="oH8SfKF6paE"><g transform="translate(-909.9999999999998 1690)"><path d="M 10,0 L 269.99999999999955,0 L 269.99999999999955,0 L 269.99999999999955,0 A 10 10 0 0 1 279.99999999999955 10 L 279.99999999999955,149.99999999999977 L 279.99999999999955,149.99999999999977 L 279.99999999999955,149.99999999999977 A 10 10 0 0 1 269.99999999999955 159.99999999999977 L 10,159.99999999999977 L 10,159.99999999999977 L 10,159.99999999999977 A 10 10 0 0 1 0 149.99999999999977 L 0,10 L 0,10 L 0,10.000000000000002 A 10 10 0 0 1 10 0 Z" fill="rgb(177,197,133)" stroke="#749032" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" stroke-dasharray="0 0"/></g><g transform="translate(-840, 1751.75) rotate(0, 70, 18.25)" width="140" height="36.5"><text text-decoration="none" x="0" fill="#ffffff" font-weight="bold" font-size="20pt" font-family="noto_regular" y="28.5">Timestamp</text><text text-decoration="none" x="140" fill="#4b4b4b" font-size="10pt" font-family="noto_regular" y="28.5"></text></g></g><g id="PUA9YkyAZa8"><g transform="translate(-909.9999999999998 1410)"><path d="M 10,0 L 269.99999999999955,0 L 269.99999999999955,0 L 269.99999999999955,0 A 10 10 0 0 1 279.99999999999955 10 L 279.99999999999955,149.99999999999977 L 279.99999999999955,149.99999999999977 L 279.99999999999955,149.99999999999977 A 10 10 0 0 1 269.99999999999955 159.99999999999977 L 10,159.99999999999977 L 10,159.99999999999977 L 10,159.99999999999977 A 10 10 0 0 1 0 149.99999999999977 L 0,10 L 0,10 L 0,10.000000000000002 A 10 10 0 0 1 10 0 Z" fill="rgb(143,209,243)" stroke="#62B7E2" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" stroke-dasharray="0 0"/></g><g transform="translate(-819.5, 1471.75) rotate(0, 49.5, 18.25)" width="99" height="36.5"><text text-decoration="none" x="0" fill="#FFFFFF" font-weight="bold" font-size="20pt" font-family="noto_regular" y="28.5">Commit</text><text text-decoration="none" x="99" fill="#4b4b4b" font-size="10pt" font-family="noto_regular" y="28.5"></text></g></g><g id="LbbbYruYCjc"><g transform="translate(-900.0000000000002 1420.0000000000005)"><path d="M 10,0 L 76,0 L 76,0 L 76,0 A 10 10 0 0 1 86 10 L 86,34.5 L 86,34.5 L 86,34.5 A 10 10 0 0 1 76 44.5 L 10,44.5 L 10,44.5 L 10,44.5 A 10 10 0 0 1 0 34.5 L 0,10 L 0,10 L 0,10.000000000000002Line truncated

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 34 KiB

+5
View File
@@ -204,11 +204,16 @@ request_token() {
local RESPONSE_STATUS=$(openssl ts -reply -in "$RESPONSE_FILE" -text 2> "$OUT_STREAM" | awk '/Status: /{print; exit}' | sed 's/Status: //' | sed 's/\.//') local RESPONSE_STATUS=$(openssl ts -reply -in "$RESPONSE_FILE" -text 2> "$OUT_STREAM" | awk '/Status: /{print; exit}' | sed 's/Status: //' | sed 's/\.//')
if [ "$RESPONSE_STATUS" != "Granted" ]; then if [ "$RESPONSE_STATUS" != "Granted" ]; then
echo "Error: Token request was not granted." echo "Error: Token request was not granted."
if [ -z "$RESPONSE_STATUS" ]; then
cat "$RESPONSE_FILE"
echo ""
else
local STATUS_INFO=$(openssl ts -reply -in "$RESPONSE_FILE" -text 2> "$OUT_STREAM" | awk '/Status info:/{f=1} f {print} /Failure info: /{exit}') local STATUS_INFO=$(openssl ts -reply -in "$RESPONSE_FILE" -text 2> "$OUT_STREAM" | awk '/Status info:/{f=1} f {print} /Failure info: /{exit}')
echo "$STATUS_INFO" echo "$STATUS_INFO"
echo "Note: If rejection reason is unrecognized or unsupported algorithm, then this tsa cannot be used for this repository, since it uses --object-format=$ALGO" echo "Note: If rejection reason is unrecognized or unsupported algorithm, then this tsa cannot be used for this repository, since it uses --object-format=$ALGO"
echo "The token request was:" echo "The token request was:"
openssl ts -query -in "$REQ_FILE" -text 2> "$OUT_STREAM" openssl ts -query -in "$REQ_FILE" -text 2> "$OUT_STREAM"
fi
return 1 return 1
fi fi
if ! openssl ts -reply -in "$RESPONSE_FILE" -token_out -out "$OUTPUT_FILE" &> "$OUT_STREAM"; then if ! openssl ts -reply -in "$RESPONSE_FILE" -token_out -out "$OUTPUT_FILE" &> "$OUT_STREAM"; then