4.64.4

app/app/api/views/setting.py

@@ -144,5 +144,6 @@ def get_available_domains_for_random_alias_v2():
 @require_api_auth
 def unlink_proton_account():
     user = g.user
-    perform_proton_account_unlink(user)
+    if not perform_proton_account_unlink(user):
+        return jsonify(error="The account cannot be unlinked"), 400
     return jsonify({"ok": True})

app/app/dashboard/views/account_setting.py

@@ -239,6 +239,8 @@ def unlink_proton_account():
         flash("Invalid request", "warning")
         return redirect(url_for("dashboard.setting"))
 
-    perform_proton_account_unlink(current_user)
-    flash("Your Proton account has been unlinked", "success")
+    if not perform_proton_account_unlink(current_user):
+        flash("Account cannot be unlinked", "warning")
+    else:
+        flash("Your Proton account has been unlinked", "success")
     return redirect(url_for("dashboard.setting"))

app/app/dashboard/views/setting.py

@@ -41,7 +41,7 @@ from app.models import (
     PartnerSubscription,
     UnsubscribeBehaviourEnum,
 )
-from app.proton.utils import get_proton_partner
+from app.proton.utils import get_proton_partner, can_unlink_proton_account
 from app.utils import (
     random_string,
     CSRFValidationForm,
@@ -323,4 +323,5 @@ def setting():
         ALIAS_RAND_SUFFIX_LENGTH=ALIAS_RANDOM_SUFFIX_LENGTH,
         connect_with_proton=CONNECT_WITH_PROTON,
         proton_linked_account=proton_linked_account,
+        can_unlink_proton_account=can_unlink_proton_account(current_user),
     )

app/app/fake_data.py

@@ -33,8 +33,11 @@ from app.models import (
     SLDomain,
     Hibp,
     AliasHibp,
+    PartnerUser,
+    PartnerSubscription,
 )
 from app.pgp_utils import load_public_key
+from app.proton.utils import get_proton_partner
 
 
 def fake_data():
@@ -269,3 +272,27 @@ def fake_data():
     CustomDomain.create(
         user_id=user.id, domain="old.com", verified=True, ownership_verified=True
     )
+
+    # Create a user
+    proton_partner = get_proton_partner()
+    user = User.create(
+        email="test@proton.me",
+        name="Proton test",
+        password="password",
+        activated=True,
+        is_admin=False,
+        intro_shown=True,
+        from_partner=True,
+        flush=True,
+    )
+    pu = PartnerUser.create(
+        user_id=user.id,
+        partner_id=proton_partner.id,
+        partner_email="test@proton.me",
+        external_user_id="DUMMY",
+        flush=True,
+    )
+    PartnerSubscription.create(
+        partner_user_id=pu.id, end_at=arrow.now().shift(years=1, days=1)
+    )
+    Session.commit()

app/app/handler/unsubscribe_generator.py

@@ -2,8 +2,8 @@ import urllib
 from email.header import Header
 from email.message import Message
 
-from app.email import headers
 from app import config
+from app.email import headers
 from app.email_utils import add_or_replace_header, delete_header
 from app.handler.unsubscribe_encoder import (
     UnsubscribeEncoder,
@@ -46,7 +46,11 @@ class UnsubscribeGenerator:
             if start == -1 or end == -1 or start >= end:
                 continue
             method = raw_method[start + 1 : end]
-            url_data = urllib.parse.urlparse(method)
+            try:
+                url_data = urllib.parse.urlparse(method)
+            except ValueError:
+                LOG.debug(f"Unsub has invalid method {method}. Ignoring.")
+                continue
             if url_data.scheme == "mailto":
                 if url_data.path == config.UNSUBSCRIBER:
                     LOG.debug(

app/app/proton/utils.py

@@ -1,9 +1,10 @@
-from newrelic import agent
 from typing import Optional
 
+from newrelic import agent
+
 from app.db import Session
-from app.log import LOG
 from app.errors import ProtonPartnerNotSetUp
+from app.log import LOG
 from app.models import Partner, PartnerUser, User
 from app.user_audit_log_utils import emit_user_audit_log, UserAuditLogAction
 
@@ -26,7 +27,13 @@ def is_proton_partner(partner: Partner) -> bool:
     return partner.name == PROTON_PARTNER_NAME
 
 
-def perform_proton_account_unlink(current_user: User):
+def can_unlink_proton_account(user: User) -> bool:
+    return (user.flags & User.FLAG_CREATED_FROM_PARTNER) == 0
+
+
+def perform_proton_account_unlink(current_user: User) -> bool:
+    if not can_unlink_proton_account(current_user):
+        return False
     proton_partner = get_proton_partner()
     partner_user = PartnerUser.get_by(
         user_id=current_user.id, partner_id=proton_partner.id
@@ -41,3 +48,4 @@ def perform_proton_account_unlink(current_user: User):
         PartnerUser.delete(partner_user.id)
     Session.commit()
     agent.record_custom_event("AccountUnlinked", {"partner": proton_partner.name})
+    return True

app/email_handler.py

@@ -602,13 +602,19 @@ def handle_forward(envelope, msg: Message, rcpt_to: str) -> List[Tuple[bool, str
                 for reply_to in reply_to_header_contents.split(",")
                 if reply_to.strip()
             ]:
-                reply_to_name, reply_to_email = parse_full_address(reply_to)
+                try:
+                    reply_to_name, reply_to_email = parse_full_address(reply_to)
+                except ValueError:
+                    LOG.d(f"Could not parse reply-to address {reply_to}")
+                    continue
                 if reply_to_email == alias.email:
                     LOG.i("Reply-to same as alias %s", alias)
                 else:
-                    reply_to_contact.append(
-                        get_or_create_reply_to_contact(reply_to_email, alias, msg)
+                    reply_contact = get_or_create_reply_to_contact(
+                        reply_to_email, alias, msg
                     )
+                    if reply_contact:
+                        reply_to_contact.append(reply_contact)
 
     if alias.user.delete_on is not None:
         LOG.d(f"user {user} is pending to be deleted. Do not forward")

app/init_app.py

@@ -56,14 +56,15 @@ def add_sl_domains():
     Session.commit()
 
 
-def add_proton_partner():
+def add_proton_partner() -> Partner:
     proton_partner = Partner.get_by(name=PROTON_PARTNER_NAME)
     if not proton_partner:
-        Partner.create(
+        proton_partner = Partner.create(
             name=PROTON_PARTNER_NAME,
             contact_email="simplelogin@protonmail.com",
         )
         Session.commit()
+    return proton_partner
 
 
 if __name__ == "__main__":

app/server.py

@@ -8,7 +8,6 @@ import flask_limiter
 import flask_profiler
 import newrelic.agent
 import sentry_sdk
-
 from flask import (
     Flask,
     redirect,
@@ -498,9 +497,9 @@ def register_custom_commands(app):
         from init_app import add_sl_domains, add_proton_partner
 
         LOG.w("reset db, add fake data")
+        add_proton_partner()
         fake_data()
         add_sl_domains()
-        add_proton_partner()
 
     @app.cli.command("send-newsletter")
     @click.option("-n", "--newsletter_id", type=int, help="Newsletter ID to be sent")

app/templates/dashboard/setting.html

@@ -144,7 +144,7 @@
       </div>
       <!-- END change name & profile picture -->
       <!-- Connect with Proton -->
-      {% if connect_with_proton %}
+      {% if connect_with_proton and can_unlink_proton_account %}
 
         <div class="card" id="connect-with-proton">
           <div class="card-body">