Remove Drone

.drone.yml

@@ -1,52 +0,0 @@
-
-kind: pipeline
-type: docker
-name: build-multiarch-images
-
-platform:
-  os: linux
-  arch: amd64
-
-steps:
-- name: make-tags
-  image: node
-  commands:
-    - echo -n "${DRONE_TAG}, latest" > .tags
-
-- name: build  
-  image: thegeeklab/drone-docker-buildx
-  privileged: true
-  settings:
-    provenance: false
-    dockerfile: app/Dockerfile
-    context: app
-    registry: git.mrmeeb.stream
-    username: 
-      from_secret: docker_username
-    password: 
-      from_secret: docker_password
-    repo: git.mrmeeb.stream/mrmeeb/simple-login
-    platforms:
-      - linux/arm64
-      - linux/amd64
-
-- name: notify
-  image: plugins/slack
-  when:
-    status:
-    - success
-    - failure
-    - killed
-  settings:
-    webhook: 
-      from_secret: slack_webhook
-    icon_url:
-      from_secret: slack_avatar
-
-trigger:
-  event:
-    include:
-    - tag
-  ref:
-    include:
-    - refs/tags/**

.gitea/workflows/build-release-image.yaml

@@ -0,0 +1,195 @@
+name: Build-Release-Image
+on:
+  push:
+    tags:
+      - '*'
+
+env:
+  CONTAINER_NAME: git.mrmeeb.stream/mrmeeb/simple-login-dev
+  TEA_VERSION: 0.9.2
+
+jobs:
+
+  Build-Image:
+    runs-on: [ubuntu-docker-latest, "${{ matrix.platform }}"]
+    strategy:
+      fail-fast: false
+      matrix:
+        platform:
+          - linux/amd64
+          - linux/arm64
+    steps:
+      - name: Prepare
+        run: |
+          platform=${{ matrix.platform }}
+          echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
+          echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
+      - name: Checkout
+        uses: actions/checkout@v2
+      # Not needed currently due to https://github.com/go-gitea/gitea/issues/29563
+      #- name: Prepare tags
+      #  id: meta
+      #  uses: docker/metadata-action@v5
+      #  with:
+      #    images: ${{ env.CONTAINER_NAME }}
+      #    tags: |
+      #      type=pep440,pattern={{version}}
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Login to Gitea Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: git.mrmeeb.stream
+          username: ${{ env.GITHUB_ACTOR }}
+          password: ${{ secrets.GTCR_TOKEN }}
+      - name: Build and push by digest
+        uses: docker/build-push-action@v5
+        id: build
+        with:
+          context: ./app
+          platforms: ${{ matrix.platform }}
+          provenance: false
+          outputs: type=image,name=${{ env.CONTAINER_NAME }},push-by-digest=true,name-canonical=true,push=true
+      - name: Export digest
+        run: |
+          mkdir -p /tmp/digests
+          digest="${{ steps.build.outputs.digest }}"
+          touch "/tmp/digests/${digest#sha256:}"
+      - name: Upload digest
+        uses: actions/upload-artifact@v3
+        with:
+          name: digests-${{ env.PLATFORM_PAIR }}
+          path: /tmp/digests/*
+          if-no-files-found: error
+          retention-days: 1
+      - name: Notify
+        uses: rjstone/discord-webhook-notify@v1
+        if: failure()
+        with:
+          severity: ${{ job.status == 'success' && 'info' || (job.status == 'cancelled' && 'warn' || 'error') }}
+          details: Build ${{ job.status == 'success' && 'succeeded' || (job.status == 'cancelled' && 'cancelled' || 'failed') }}!
+          webhookUrl: ${{ secrets.DISCORD_WEBHOOK }}
+          username: Gitea
+          avatarUrl: ${{ vars.RUNNER_ICON_URL }}
+
+  Merge-Images:
+    runs-on: ubuntu-docker-latest
+    needs: [Build-Image]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Get tag
+        run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
+      - name: Download digests
+        uses: actions/download-artifact@v3
+        with:
+          path: /tmp/digests
+          pattern: digests-*
+          merge-multiple: true
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      # Not needed currently due to https://github.com/go-gitea/gitea/issues/29563
+      #- name: Prepare Docker metadata
+      #  id: meta
+      #  uses: docker/metadata-action@v5
+      #  with:
+      #    images: ${{ env.CONTAINER_NAME }}
+      - name: Login to Gitea Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: git.mrmeeb.stream
+          username: ${{ env.GITHUB_ACTOR }}
+          password: ${{ secrets.GTCR_TOKEN }}
+      - name: Create manifest latest
+        working-directory: /tmp/digests
+        run: |
+          docker manifest create ${{ env.CONTAINER_NAME }}:latest \
+            --amend ${{ env.CONTAINER_NAME }}@sha256:$(ls -p digests-linux-amd64/* | cut -d / -f 2) \
+            --amend ${{ env.CONTAINER_NAME }}@sha256:$(ls -p digests-linux-arm64/* | cut -d / -f 2)
+          #docker manifest annotate --arch amd64 --os linux ${{ env.CONTAINER_NAME }}:latest ${{ env.CONTAINER_NAME }}@sha256:$(ls -p digests-linux-amd64/* | cut -d / -f 2)
+          #docker manifest annotate --arch arm64 --os linux ${{ env.CONTAINER_NAME }}:latest ${{ env.CONTAINER_NAME }}@sha256:$(ls -p digests-linux-arm64/* | cut -d / -f 2)
+          docker manifest inspect ${{ env.CONTAINER_NAME }}:latest
+
+          docker manifest push ${{ env.CONTAINER_NAME }}:latest
+      - name: Create manifest tagged
+        working-directory: /tmp/digests
+        run: |
+          docker manifest create ${{ env.CONTAINER_NAME }}:${{ env.RELEASE_VERSION }} \
+            --amend ${{ env.CONTAINER_NAME }}@sha256:$(ls -p digests-linux-amd64/* | cut -d / -f 2) \
+            --amend ${{ env.CONTAINER_NAME }}@sha256:$(ls -p digests-linux-arm64/* | cut -d / -f 2)
+          #docker manifest annotate --arch amd64 --os linux ${{ env.CONTAINER_NAME }}:${{ env.RELEASE_VERSION }} ${{ env.CONTAINER_NAME }}@sha256:$(ls -p digests-linux-amd64/* | cut -d / -f 2)
+          #docker manifest annotate --arch arm64 --os linux ${{ env.CONTAINER_NAME }}:${{ env.RELEASE_VERSION }} ${{ env.CONTAINER_NAME }}@sha256:$(ls -p digests-linux-arm64/* | cut -d / -f 2)
+          docker manifest inspect ${{ env.CONTAINER_NAME }}:${{ env.RELEASE_VERSION }}
+
+          docker manifest push ${{ env.CONTAINER_NAME }}:${{ env.RELEASE_VERSION }}
+      # Disabled due to https://github.com/go-gitea/gitea/issues/29563
+      #- name: Create manifest list and push
+      #  working-directory: /tmp/digests
+      #  run: |
+      #    echo $DOCKER_METADATA_OUTPUT_JSON
+      #    echo $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
+      #      $(printf '${{ env.CONTAINER_NAME }}@sha256:%s ' $(ls -p */* | cut -d / -f 2))
+      #    docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
+      #      $(printf '${{ env.CONTAINER_NAME }}@sha256:%s ' $(ls -p */* | cut -d / -f 2))
+      #- name: Inspect image
+      #  run: |
+      #    docker buildx imagetools inspect ${{ env.CONTAINER_NAME }}:${{ steps.meta.outputs.version }}          
+      - name: Notify
+        uses: rjstone/discord-webhook-notify@v1
+        if: failure()
+        with:
+          severity: ${{ job.status == 'success' && 'info' || (job.status == 'cancelled' && 'warn' || 'error') }}
+          details: Build ${{ job.status == 'success' && 'succeeded' || (job.status == 'cancelled' && 'cancelled' || 'failed') }}!
+          webhookUrl: ${{ secrets.DISCORD_WEBHOOK }}
+          username: Gitea
+          avatarUrl: ${{ vars.RUNNER_ICON_URL }}
+
+  Create-Release:
+    runs-on: [ubuntu-latest, linux/amd64]
+    needs: [Merge-Images]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Get tag
+        run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
+      - name: Prepare tea
+        run: |
+          # Download tea from Gitea release page
+          echo "Downloading Tea v${{ env.TEA_VERSION }}" && \
+          wget -q -O tea https://gitea.com/gitea/tea/releases/download/v${{ env.TEA_VERSION }}/tea-${{ env.TEA_VERSION }}-linux-amd64 && \
+          echo "Downloaded Tea" && \
+          chmod +x tea && \
+          # Login to Gitea
+          echo "Logging in to Gitea using Tea" && \
+          ./tea login add --name SimpleLogin --url https://git.mrmeeb.stream --token ${{ secrets.GITHUB_TOKEN }} && \
+          echo "Done"
+      - name: Make release
+        run: |
+          echo "Creating release" && \
+          ./tea release create --login "SimpleLogin" --repo ${{ env.GITHUB_REPOSITORY }} --tag ${{ env.RELEASE_VERSION }} -t ${{ env.RELEASE_VERSION }} -n "Triggered by release of v${{ env.RELEASE_VERSION }} by the SimpleLogin team. <a href=\"https://github.com/simple-login/app/releases/tag/v${{ env.RELEASE_VERSION }}\" target=\"_blank\">View the changelog</a>" && \
+          echo "Done"
+      - name: Notify
+        uses: rjstone/discord-webhook-notify@v1
+        if: failure()
+        with:
+          severity: ${{ job.status == 'success' && 'info' || (job.status == 'cancelled' && 'warn' || 'error') }}
+          details: Release ${{ job.status == 'success' && 'succeeded' || (job.status == 'cancelled' && 'cancelled' || 'failed') }}!
+          webhookUrl: ${{ secrets.DISCORD_WEBHOOK }}
+          username: Gitea
+          avatarUrl: ${{ vars.RUNNER_ICON_URL }}
+
+  Notify:
+    runs-on: ubuntu-latest
+    needs: [Build-Image, Merge-Images, Create-Release]
+    steps:
+      - name: Notify
+        uses: rjstone/discord-webhook-notify@v1
+        if: always()
+        with:
+          severity: ${{ job.status == 'success' && 'info' || (job.status == 'cancelled' && 'warn' || 'error') }}
+          details: Release ${{ job.status == 'success' && 'succeeded' || (job.status == 'cancelled' && 'cancelled' || 'failed') }}!
+          webhookUrl: ${{ secrets.DISCORD_WEBHOOK }}
+          username: Gitea
+          avatarUrl: ${{ vars.RUNNER_ICON_URL }}

app/app/auth/views/google.py

@@ -7,7 +7,7 @@ from app.config import URL, GOOGLE_CLIENT_ID, GOOGLE_CLIENT_SECRET
 from app.db import Session
 from app.log import LOG
 from app.models import User, File, SocialAuth
-from app.utils import random_string, sanitize_email, sanitize_next_url
+from app.utils import random_string, sanitize_email
 from .login_utils import after_login
 
 _authorization_base_url = "https://accounts.google.com/o/oauth2/v2/auth"
@@ -29,7 +29,7 @@ def google_login():
     # to avoid flask-login displaying the login error message
     session.pop("_flashes", None)
 
-    next_url = sanitize_next_url(request.args.get("next"))
+    next_url = request.args.get("next")
 
     # Google does not allow to append param to redirect_url
     # we need to pass the next url by session

app/email_handler.py

@@ -236,16 +236,15 @@ def get_or_create_contact(from_header: str, mail_from: str, alias: Alias) -> Con
             Session.commit()
     else:
         try:
-            contact_email_for_reply = (
-                contact_email if is_valid_email(contact_email) else ""
-            )
             contact = Contact.create(
                 user_id=alias.user_id,
                 alias_id=alias.id,
                 website_email=contact_email,
                 name=contact_name,
                 mail_from=mail_from,
-                reply_email=generate_reply_email(contact_email_for_reply, alias),
+                reply_email=generate_reply_email(contact_email, alias)
+                if is_valid_email(contact_email)
+                else NOREPLY,
                 automatic_created=True,
             )
             if not contact_email:

app/oneshot/replace_noreply_in_cotnacts.py

@@ -1,53 +0,0 @@
-#!/usr/bin/env python3
-import argparse
-import time
-
-
-from app import config
-from app.email_utils import generate_reply_email
-from app.email_validation import is_valid_email
-from app.models import Alias
-from app.db import Session
-
-parser = argparse.ArgumentParser(
-    prog=f"Replace {config.NOREPLY}",
-    description=f"Replace {config.NOREPLY} from contacts reply email",
-)
-args = parser.parse_args()
-
-el_query = "SELECT id, alias_id, website_email from contact where id>=:last_id AND reply_email=:reply_email ORDER BY id ASC LIMIT :step"
-update_query = "UPDATE contact SET reply_email=:reply_email WHERE id=:contact_id "
-updated = 0
-start_time = time.time()
-step = 100
-last_id = 0
-print(f"Replacing contacts with reply_email={config.NOREPLY}")
-while True:
-    rows = Session.execute(
-        el_query, {"last_id": last_id, "reply_email": config.NOREPLY, "step": step}
-    )
-    loop_updated = 0
-    for row in rows:
-        contact_id = row[0]
-        alias_id = row[1]
-        last_id = contact_id
-        website_email = row[2]
-        contact_email_for_reply = website_email if is_valid_email(website_email) else ""
-        alias = Alias.get(alias_id)
-        if alias is None:
-            print(f"CANNOT find alias {alias_id} in database for contact {contact_id}")
-        reply_email = generate_reply_email(contact_email_for_reply, alias)
-        print(
-            f"Replacing contact {contact_id} with {website_email} reply_email for {reply_email}"
-        )
-        Session.execute(
-            update_query, {"contact_id": row[0], "reply_email": reply_email}
-        )
-        Session.commit()
-        updated += 1
-        loop_updated += 1
-    elapsed = time.time() - start_time
-    print(f"\rContact {last_id} done")
-    if loop_updated == 0:
-        break
-print("")

app/tests/auth/test_login.py

@@ -6,27 +6,16 @@ from tests.utils import create_new_user
 
 
 def test_unactivated_user_login(flask_client):
-    """
+    user = create_new_user()
-    Test function for logging in with an unactivated user.
+    user.activated = False
+    Session.commit()
 
-    Steps:
-    1. Creates a new user.
-    2. Sets the user's activated status to False.
-    3. Sends a POST request to the login route with user credentials.
-    4. Checks the response status code and content for expected messages.
-    """
-    user = create_new_user()  # Creating a new user
-    user.activated = False  # Setting the user's activated status to False
-    Session.commit()  # Committing the session changes
-
-    # Sending a POST request to the login route with user credentials and following redirects
     r = flask_client.post(
         url_for("auth.login"),
         data={"email": user.email, "password": "password"},
         follow_redirects=True,
     )
 
-    # Asserting the response status code and content for expected messages
     assert r.status_code == 200
     assert (
         b"Please check your inbox for the activation email. You can also have this email re-sent"
@@ -35,98 +24,59 @@ def test_unactivated_user_login(flask_client):
 
 
 def test_non_canonical_login(flask_client):
-    """
+    email = f"pre.{random_string(10)}@gmail.com"
-    Test function for logging in with a non-canonical email.
+    name = f"NAME-{random_string(10)}"
+    user = create_new_user(email, name)
+    Session.commit()
 
-    Steps:
-    1. Creates a new user with a non-canonical email.
-    2. Sends a POST request to the login route with user credentials.
-    3. Checks the response status code and content for expected messages.
-    4. Checks the canonicalization of the email.
-    5. Logs out the user.
-    6. Sends a POST request to the login route with the canonicalized email.
-    7. Checks the response status code and content for expected messages.
-    """
-    email = f"pre.{random_string(10)}@gmail.com"  # Generating a non-canonical email
-    name = f"NAME-{random_string(10)}"  # Generating a random name
-    user = create_new_user(
-        email, name
-    )  # Creating a new user with the generated email and name
-    Session.commit()  # Committing the session changes
-
-    # Sending a POST request to the login route with user credentials and following redirects
     r = flask_client.post(
         url_for("auth.login"),
         data={"email": user.email, "password": "password"},
         follow_redirects=True,
     )
 
-    # Asserting the response status code and content for expected messages
     assert r.status_code == 200
     assert name.encode("utf-8") in r.data
 
-    # Canonicalizing the email
     canonical_email = canonicalize_email(email)
-    assert (
+    assert canonical_email != email
-        canonical_email != email
-    )  # Checking if the canonical email is different from the original email
 
-    flask_client.get(url_for("auth.logout"))  # Logging out the user
+    flask_client.get(url_for("auth.logout"))
 
-    # Sending a POST request to the login route with the canonicalized email and following redirects
     r = flask_client.post(
         url_for("auth.login"),
         data={"email": canonical_email, "password": "password"},
         follow_redirects=True,
     )
 
-    # Asserting the response status code and content for expected messages
     assert r.status_code == 200
     assert name.encode("utf-8") not in r.data
 
 
 def test_canonical_login_with_non_canonical_email(flask_client):
-    """
+    suffix = f"{random_string(10)}@gmail.com"
-    Test function for logging in with a canonical email and a non-canonical email.
+    canonical_email = f"pre{suffix}"
+    non_canonical_email = f"pre.{suffix}"
+    name = f"NAME-{random_string(10)}"
+    create_new_user(canonical_email, name)
+    Session.commit()
 
-    Steps:
-    1. Generates canonical and non-canonical email addresses.
-    2. Creates a new user with the canonical email.
-    3. Sends a POST request to the login route with the non-canonical email.
-    4. Checks the response status code and content for expected messages.
-    5. Logs out the user.
-    6. Sends a POST request to the login route with the canonical email.
-    7. Checks the response status code and content for expected messages.
-    """
-    suffix = f"{random_string(10)}@gmail.com"  # Generating a random suffix for emails
-    canonical_email = f"pre{suffix}"  # Generating a canonical email
-    non_canonical_email = f"pre.{suffix}"  # Generating a non-canonical email
-    name = f"NAME-{random_string(10)}"  # Generating a random name
-    create_new_user(
-        canonical_email, name
-    )  # Creating a new user with the canonical email
-    Session.commit()  # Committing the session changes
-
-    # Sending a POST request to the login route with the non-canonical email and following redirects
     r = flask_client.post(
         url_for("auth.login"),
         data={"email": non_canonical_email, "password": "password"},
         follow_redirects=True,
     )
 
-    # Asserting the response status code and content for expected messages
     assert r.status_code == 200
     assert name.encode("utf-8") in r.data
 
-    flask_client.get(url_for("auth.logout"))  # Logging out the user
+    flask_client.get(url_for("auth.logout"))
 
-    # Sending a POST request to the login route with the canonical email and following redirects
     r = flask_client.post(
         url_for("auth.login"),
         data={"email": canonical_email, "password": "password"},
         follow_redirects=True,
     )
 
-    # Asserting the response status code and content for expected messages
     assert r.status_code == 200
     assert name.encode("utf-8") in r.data