From 801556f9d3c4c09225a4e336a41ff4b412f32ab3 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Thu, 30 Mar 2023 11:18:14 +0200 Subject: [PATCH 01/10] try to fix key sharing --- rootfs/etc/confd/templates/config.yaml.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rootfs/etc/confd/templates/config.yaml.tmpl b/rootfs/etc/confd/templates/config.yaml.tmpl index cba62fd..3f71fe7 100644 --- a/rootfs/etc/confd/templates/config.yaml.tmpl +++ b/rootfs/etc/confd/templates/config.yaml.tmpl @@ -340,7 +340,7 @@ bridge: # This will cause the bridge bot to be in private chats for the encryption to work properly. default: true # Whether to use MSC2409/MSC3202 instead of /sync long polling for receiving encryption-related data. - appservice: false + appservice: true # Require encryption, drop any unencrypted messages. require: false # Enable key sharing? If enabled, key requests for rooms where users are in will be fulfilled. From 34405b198573577a58593c2692d3c52d8fb9de21 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Thu, 30 Mar 2023 11:22:23 +0200 Subject: [PATCH 02/10] try to fix key sharing --- rootfs/etc/confd/templates/config.yaml.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rootfs/etc/confd/templates/config.yaml.tmpl b/rootfs/etc/confd/templates/config.yaml.tmpl index 3f71fe7..b25e4f0 100644 --- a/rootfs/etc/confd/templates/config.yaml.tmpl +++ b/rootfs/etc/confd/templates/config.yaml.tmpl @@ -362,7 +362,7 @@ bridge: # Minimum level that the bridge should accept for incoming Matrix messages. send: unverified # Minimum level that the bridge should require for accepting key requests. - share: cross-signed-tofu + share: cross-untrusted # Options for Megolm room key rotation. These options allow you to # configure the m.room.encryption event content. See: # https://spec.matrix.org/v1.3/client-server-api/#mroomencryption for From e5d98665b1eaca8543ad1ac88c8f90b36594ffd5 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Thu, 30 Mar 2023 11:35:45 +0200 Subject: [PATCH 03/10] try to fix key sharing --- rootfs/etc/confd/templates/config.yaml.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rootfs/etc/confd/templates/config.yaml.tmpl b/rootfs/etc/confd/templates/config.yaml.tmpl index b25e4f0..3f71fe7 100644 --- a/rootfs/etc/confd/templates/config.yaml.tmpl +++ b/rootfs/etc/confd/templates/config.yaml.tmpl @@ -362,7 +362,7 @@ bridge: # Minimum level that the bridge should accept for incoming Matrix messages. send: unverified # Minimum level that the bridge should require for accepting key requests. - share: cross-untrusted + share: cross-signed-tofu # Options for Megolm room key rotation. These options allow you to # configure the m.room.encryption event content. See: # https://spec.matrix.org/v1.3/client-server-api/#mroomencryption for From 72e71c44d7e290af39c0ad5b990561c03ddb19ab Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Thu, 6 Apr 2023 13:20:20 +0200 Subject: [PATCH 04/10] use /sync for encryption data --- rootfs/etc/confd/templates/config.yaml.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rootfs/etc/confd/templates/config.yaml.tmpl b/rootfs/etc/confd/templates/config.yaml.tmpl index 3f71fe7..cba62fd 100644 --- a/rootfs/etc/confd/templates/config.yaml.tmpl +++ b/rootfs/etc/confd/templates/config.yaml.tmpl @@ -340,7 +340,7 @@ bridge: # This will cause the bridge bot to be in private chats for the encryption to work properly. default: true # Whether to use MSC2409/MSC3202 instead of /sync long polling for receiving encryption-related data. - appservice: true + appservice: false # Require encryption, drop any unencrypted messages. require: false # Enable key sharing? If enabled, key requests for rooms where users are in will be fulfilled. From 7fa6a26fa9c95c96669462756e5401b58a359a38 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Thu, 6 Apr 2023 20:17:33 +0200 Subject: [PATCH 05/10] use personal spaces --- rootfs/etc/confd/templates/config.yaml.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rootfs/etc/confd/templates/config.yaml.tmpl b/rootfs/etc/confd/templates/config.yaml.tmpl index cba62fd..73a5479 100644 --- a/rootfs/etc/confd/templates/config.yaml.tmpl +++ b/rootfs/etc/confd/templates/config.yaml.tmpl @@ -103,7 +103,7 @@ bridge: displayname_template: "{{"{{"}}if .PushName{{"}}"}}{{"{{"}}.PushName{{"}}"}}{{"{{"}}else if .BusinessName{{"}}"}}{{"{{"}}.BusinessName{{"}}"}}{{"{{"}}else{{"}}"}}{{"{{"}}.JID{{"}}"}}{{"{{"}}end{{"}}"}} (WA)" # Should the bridge create a space for each logged-in user and add bridged rooms to it? # Users who logged in before turning this on should run `!wa sync space` to create and fill the space for the first time. - personal_filtering_spaces: false + personal_filtering_spaces: true # Should the bridge send a read receipt from the bridge bot when a message has been sent to WhatsApp? delivery_receipts: false # Whether the bridge should send the message status as a custom com.beeper.message_send_status event. From c0de64cc5e8183a2f9bfa01d414298ec04f21d8a Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Mon, 31 Jul 2023 12:02:17 +0200 Subject: [PATCH 06/10] push to 0.9.0 --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 27e2d97..e66317c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ -FROM docker.io/golang:1.19.3-alpine3.16 as builder +FROM docker.io/golang:1.20-alpine3.18 as builder -ENV VERSION=v0.8.3 +ENV VERSION=v0.9.0 RUN apk --no-cache add \ git \ @@ -18,7 +18,7 @@ RUN git checkout $VERSION RUN go build -o /build/bin/mautrix-whatsapp -FROM docker.io/thallian/confd-env:3.17-3.1.3.0 +FROM docker.io/thallian/confd-env:3.18-3.1.5.0 RUN addgroup -g 2222 matrix-bridge RUN adduser -h /var/lib/matrix-bridge -u 2222 -D -G matrix-bridge matrix-bridge @@ -28,7 +28,7 @@ COPY --from=builder /build/bin/mautrix-whatsapp /bin/mautrix-whatsapp RUN apk --no-cache add \ ca-certificates \ libstdc++ \ - olm + olm WORKDIR /var/lib/matrix-bridge From 9e5b10ad74bd5ffff7e997a0d3c33ec7a35e8491 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Tue, 22 Aug 2023 09:15:19 +0200 Subject: [PATCH 07/10] push to 0.10.0 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e66317c..a80aa57 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM docker.io/golang:1.20-alpine3.18 as builder -ENV VERSION=v0.9.0 +ENV VERSION=v0.10.0 RUN apk --no-cache add \ git \ From 1176eb3ec2a50d6ff8950e6f68c5221f4cb05973 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Fri, 22 Sep 2023 11:43:40 +0200 Subject: [PATCH 08/10] push to 0.10.2 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a80aa57..34a4582 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM docker.io/golang:1.20-alpine3.18 as builder -ENV VERSION=v0.10.0 +ENV VERSION=v0.10.2 RUN apk --no-cache add \ git \ From 6bfabc3bc0ffb162b31d3ab749e45261cd6dbba4 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Tue, 2 Jan 2024 11:57:05 +0100 Subject: [PATCH 09/10] push to 0.10.5 --- .gitea/workflows/container.yaml | 12 ++++++++++++ .woodpecker.yml | 11 ----------- Dockerfile => Containerfile | 6 +++--- 3 files changed, 15 insertions(+), 14 deletions(-) create mode 100644 .gitea/workflows/container.yaml delete mode 100644 .woodpecker.yml rename Dockerfile => Containerfile (86%) diff --git a/.gitea/workflows/container.yaml b/.gitea/workflows/container.yaml new file mode 100644 index 0000000..e48b3fd --- /dev/null +++ b/.gitea/workflows/container.yaml @@ -0,0 +1,12 @@ +name: Build Multiarch Container Image +on: [push] +jobs: + call-reusable-workflow: + uses: container/multiarch-build-workflow/.gitea/workflows/build.yaml@main + with: + repository: ${{ gitea.repository }} + ref_name: ${{ gitea.ref_name }} + sha: ${{ gitea.sha }} + registry_url: ${{ secrets.REGISTRY_URL }} + registry_user: ${{ secrets.REGISTRY_USER }} + registry_pw: ${{ secrets.REGISTRY_PW }} diff --git a/.woodpecker.yml b/.woodpecker.yml deleted file mode 100644 index 38af04e..0000000 --- a/.woodpecker.yml +++ /dev/null @@ -1,11 +0,0 @@ -pipeline: - publish-docker-image: - image: plugins/kaniko - settings: - repo: docker.io/thallian/matrix-appservice-whatsapp - tags: latest,${CI_COMMIT_SHA:0:8},${CI_COMMIT_TAG=pre} - dockerfile: Dockerfile - username: - from_secret: DOCKER_USER - password: - from_secret: DOCKER_PW \ No newline at end of file diff --git a/Dockerfile b/Containerfile similarity index 86% rename from Dockerfile rename to Containerfile index 34a4582..a3ed8c9 100644 --- a/Dockerfile +++ b/Containerfile @@ -1,6 +1,6 @@ -FROM docker.io/golang:1.20-alpine3.18 as builder +FROM docker.io/golang:1.21-alpine3.19 as builder -ENV VERSION=v0.10.2 +ENV VERSION=v0.10.5 RUN apk --no-cache add \ git \ @@ -18,7 +18,7 @@ RUN git checkout $VERSION RUN go build -o /build/bin/mautrix-whatsapp -FROM docker.io/thallian/confd-env:3.18-3.1.5.0 +FROM docker.io/thallian/confd-env:3.19-3.1.6.2 RUN addgroup -g 2222 matrix-bridge RUN adduser -h /var/lib/matrix-bridge -u 2222 -D -G matrix-bridge matrix-bridge From 58f339286b6b29f957e7d2d29f97c49b17fb2493 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Thu, 28 Mar 2024 13:55:22 +0100 Subject: [PATCH 10/10] push to 0.10.6 --- Containerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Containerfile b/Containerfile index a3ed8c9..ea8578d 100644 --- a/Containerfile +++ b/Containerfile @@ -1,6 +1,6 @@ FROM docker.io/golang:1.21-alpine3.19 as builder -ENV VERSION=v0.10.5 +ENV VERSION=v0.10.6 RUN apk --no-cache add \ git \