Merge branch 'master' into rootless_s6

This commit is contained in:
Bernhard B 2026-05-28 23:59:55 +02:00
commit 15f7ef2b28
3 changed files with 10 additions and 2 deletions

View File

@ -61,12 +61,14 @@ RUN if [ "$(uname -m)" = "x86_64" ]; then \
cd /tmp \
&& wget https://github.com/bbernhard/signal-cli-native-builds/releases/download/v${SIGNAL_CLI_VERSION}/signal-cli-native-v${SIGNAL_CLI_VERSION}.tar.gz \
&& tar xvf signal-cli-native-v${SIGNAL_CLI_VERSION}.tar.gz \
&& cp signal-cli-native-v${SIGNAL_CLI_VERSION}/x86-64/signal-cli-native /tmp/signal-cli-native; \
&& cp signal-cli-native-v${SIGNAL_CLI_VERSION}/x86-64/signal-cli-native /tmp/signal-cli-native \
&& chmod +x /tmp/signal-cli-native; \
elif [ "$(uname -m)" = "aarch64" ] ; then \
cd /tmp \
&& wget https://github.com/bbernhard/signal-cli-native-builds/releases/download/v${SIGNAL_CLI_VERSION}/signal-cli-native-v${SIGNAL_CLI_VERSION}.tar.gz \
&& tar xvf signal-cli-native-v${SIGNAL_CLI_VERSION}.tar.gz \
&& cp signal-cli-native-v${SIGNAL_CLI_VERSION}/arm64/signal-cli-native /tmp/signal-cli-native; \
&& cp signal-cli-native-v${SIGNAL_CLI_VERSION}/arm64/signal-cli-native /tmp/signal-cli-native \
&& chmod +x /tmp/signal-cli-native; \
elif [ "$(uname -m)" = "armv7l" ] ; then \
echo "GRAALVM doesn't support 32bit" \
&& echo "Creating temporary file, otherwise the below copy doesn't work for armv7" \

View File

@ -44,6 +44,9 @@ func (attachmentEntry *AttachmentEntry) extractMetaData(attachmentData string) {
}
attachmentEntry.Base64 = attachmentData[base64FlagIndex+len("base64,"):]
if base64FlagIndex == 0 {
return
}
metaDataKeys := map[string]string{
"data:": "MimeInfo",
"filename=": "FileName",

View File

@ -45,6 +45,9 @@ func Test_Attachment_ExtractMetadata_ShouldPrepareDataFor_toDataForSignal(t *tes
{
"-base64 +data +filename", "data:someData;filename=file.name;INVALIDMTIzNDU=", false, "data:someData;filename=file.name;INVALIDMTIzNDU=", false, "", "", "data:someData;filename=file.name;INVALIDMTIzNDU=",
},
{
"base64 prefix at start +data", "base64,data:someData", false, "data:someData", false, "", "", "data:someData",
},
}
attachmentTmp := flag.String("attachment-tmp-dir", string(os.PathSeparator)+"tmp"+string(os.PathSeparator), "Attachment tmp directory")