Rmv regex validation on AS org and actor fields. Not helpful to end user

Author: th3coop

tests/unit/oidc/forms/test_activestate.py

@@ -540,47 +540,23 @@ def test_lookup_organization_succeeds(self, monkeypatch):
     @pytest.mark.parametrize(
         "data",
         [
+            # Organization
+            # Missing
+            # Empty
+            {"organization": "", "project": "good", "actor": "good"},
+            # Actor
+            # Missing
+            # Empty
+            {"actor": "", "project": "good", "organization": "good"},
+            {"actor": None, "project": "good", "organization": "good"},
+            # Project
             # Too short
             # Too long
             # Invalid characters
             # No leading or ending -
             # No double --
             # Missing
             # Empty
-            #
-            # organization
-            {"organization": "AB", "project": "good", "actor": "good"},
-            {
-                "organization": "abcdefghojklmnopqrstuvwxyz123456789012345",
-                "project": "good",
-                "actor": "good",
-            },
-            {
-                "organization": "invalid_characters@",
-                "project": "good",
-                "actor": "good",
-            },
-            {"organization": "-foo-", "project": "good", "actor": "good"},
-            {"organization": "---", "project": "good", "actor": "good"},
-            {"organization": "", "project": "good", "actor": "good"},
-            {"organization": None, "project": "good", "actor": "good"},
-            # actor
-            {"actor": "AB", "project": "good", "organization": "good"},
-            {
-                "actor": "abcdefghojklmnopqrstuvwxyz123456789012345",
-                "project": "good",
-                "organization": "good",
-            },
-            {
-                "actor": "invalid_characters@",
-                "project": "good",
-                "organization": "good",
-            },
-            {"actor": "-foo-", "project": "good", "organization": "good"},
-            {"actor": "---", "project": "good", "organization": "good"},
-            {"actor": "", "project": "good", "organization": "good"},
-            {"actor": None, "project": "good", "organization": "good"},
-            # project
             {"project": "AB", "actor": "good", "organization": "good"},
             {
                 "project": "abcdefghojklmnopqrstuvwxyz123456789012345",

warehouse/locale/messages.pot

@@ -581,47 +581,43 @@ msgstr ""
 msgid "Publisher must be specified by ID"
 msgstr ""
 
-#: warehouse/oidc/forms/activestate.py:49
+#: warehouse/oidc/forms/activestate.py:48
 msgid "Double dashes are not allowed in the name"
 msgstr ""
 
-#: warehouse/oidc/forms/activestate.py:56
+#: warehouse/oidc/forms/activestate.py:55
 msgid "Leading or trailing dashes are not allowed in the name"
 msgstr ""
 
-#: warehouse/oidc/forms/activestate.py:80
-#: warehouse/oidc/forms/activestate.py:93
+#: warehouse/oidc/forms/activestate.py:79
+#: warehouse/oidc/forms/activestate.py:92
 msgid "Unexpected error from ActiveState. Try again in a few minutes"
 msgstr ""
 
-#: warehouse/oidc/forms/activestate.py:88
-#: warehouse/oidc/forms/activestate.py:104
-#: warehouse/oidc/forms/activestate.py:113
+#: warehouse/oidc/forms/activestate.py:87
+#: warehouse/oidc/forms/activestate.py:103
+#: warehouse/oidc/forms/activestate.py:112
 msgid "Unexpected error from ActiveState. Try again"
 msgstr ""
 
-#: warehouse/oidc/forms/activestate.py:123
+#: warehouse/oidc/forms/activestate.py:122
 msgid "Specify ActiveState organization name"
 msgstr ""
 
-#: warehouse/oidc/forms/activestate.py:127
-msgid "Invalid ActiveState organization name"
-msgstr ""
-
-#: warehouse/oidc/forms/activestate.py:137
+#: warehouse/oidc/forms/activestate.py:130
 msgid "Specify ActiveState project name"
 msgstr ""
 
-#: warehouse/oidc/forms/activestate.py:141
-#: warehouse/oidc/forms/activestate.py:145
+#: warehouse/oidc/forms/activestate.py:134
+#: warehouse/oidc/forms/activestate.py:138
 msgid "Invalid ActiveState project name"
 msgstr ""
 
-#: warehouse/oidc/forms/activestate.py:174
+#: warehouse/oidc/forms/activestate.py:161
 msgid "ActiveState organization not found"
 msgstr ""
 
-#: warehouse/oidc/forms/activestate.py:194
+#: warehouse/oidc/forms/activestate.py:181
 msgid "ActiveState actor not found"
 msgstr ""
 

warehouse/oidc/forms/activestate.py

@@ -23,7 +23,6 @@
 from warehouse.i18n import localize as _
 from warehouse.oidc.forms._core import PendingPublisherMixin
 
-_VALID_ORG_URL_NAME_AND_ACTOR_NAME = re.compile(r"^[a-zA-Z0-9-]{3,40}$")
 _VALID_PROJECT_NAME = re.compile(r"^[.a-zA-Z0-9-]{3,40}$")
 _DOUBLE_DASHES = re.compile(r"--+")
 
@@ -122,12 +121,6 @@ class ActiveStatePublisherBase(forms.Form):
             wtforms.validators.InputRequired(
                 message=_("Specify ActiveState organization name"),
             ),
-            wtforms.validators.Regexp(
-                _VALID_ORG_URL_NAME_AND_ACTOR_NAME,
-                message=_("Invalid ActiveState organization name"),
-            ),
-            _no_double_dashes,
-            _no_leading_or_trailing_dashes,
         ]
     )
 
@@ -154,12 +147,6 @@ class ActiveStatePublisherBase(forms.Form):
             wtforms.validators.InputRequired(
                 message=("Specify the ActiveState actor username")
             ),
-            wtforms.validators.Regexp(
-                _VALID_ORG_URL_NAME_AND_ACTOR_NAME,
-                message=("Invalid ActiveState username"),
-            ),
-            _no_double_dashes,
-            _no_leading_or_trailing_dashes,
         ]
     )