udata 9.0.1.dev29541__py2.py3-none-any.whl → 9.0.1.dev29597__py2.py3-none-any.whl

udata/uris.py

@@ -3,6 +3,7 @@ import re
 from werkzeug.routing import BuildError
 from flask import current_app, url_for
 from netaddr import IPAddress, AddrFormatError
+from udata.i18n import _
 
 from udata.settings import Defaults
 
@@ -47,12 +48,12 @@ class ValidationError(ValueError):
 
 def error(url, reason=None):
     __tracebackhide__ = True
-    if not isinstance(url, str):
-        url = url.decode('utf8')
-    msg = 'Invalid URL "{0}"'.format(url)
-    if reason:
-        msg = ': '.join((msg, reason))
-    raise ValidationError(msg.encode('utf8'))
+    if reason is not None:
+        msg = _('Invalid URL "{url}": {reason}').format(url=url, reason=reason)
+    else:
+        msg = _('Invalid URL "{url}"').format(url=url)
+
+    raise ValidationError(msg)
 
 
 def config_for(value, key):
@@ -101,14 +102,14 @@ def validate(url, schemes=None, tlds=None, private=None, local=None,
 
     scheme = (match.group('scheme') or '').lower()
     if scheme and scheme not in schemes:
-        error(url, 'Invalid scheme {0}'.format(scheme))
+        error(url, _('Invalid scheme {0}, allowed schemes: {1}').format(scheme, ", ".join(schemes)))
 
     if not credentials and match.group('credentials'):
-        error(url, 'Credentials in URL are not allowed')
+        error(url, _('Credentials in URL are not allowed'))
 
     tld = match.group('tld')
     if tld and tld not in tlds and idna(tld) not in tlds:
-        error(url, 'Invalid TLD {0}'.format(tld))
+        error(url, _('Invalid TLD {0}').format(tld))
 
     ip = match.group('ipv6') or match.group('ipv4')
     if ip:
@@ -117,15 +118,15 @@ def validate(url, schemes=None, tlds=None, private=None, local=None,
         except AddrFormatError:
             error(url)
         if ip.is_multicast():
-            error(url, '{0} is a multicast IP'.format(ip))
+            error(url, _('{0} is a multicast IP').format(ip))
         elif not ip.is_loopback() and ip.is_hostmask() or ip.is_netmask():
-            error(url, '{0} is a mask IP'.format(ip))
+            error(url, _('{0} is a mask IP').format(ip))
 
     if not local:
         if ip and ip.is_loopback() or match.group('localhost'):
-            error(url, 'is a local URL')
+            error(url, _('is a local URL'))
 
     if not private and ip and ip.is_private():
-        error(url, 'is a private URL')
+        error(url, _('is a private URL'))
 
     return url

{udata-9.0.1.dev29541.dist-info → udata-9.0.1.dev29597.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: udata
-Version: 9.0.1.dev29541
+Version: 9.0.1.dev29597
 Summary: Open data portal
 Home-page: https://github.com/opendatateam/udata
 Author: Opendata Team
@@ -144,6 +144,7 @@ It is collectively taken care of by members of the
 - Fix reuses' datasets references [#3057](https://github.com/opendatateam/udata/pull/3057)
 - Save and show harvest logs [#3053](https://github.com/opendatateam/udata/pull/3053)
 - Fix missing `ObjectId` validation on `/sources` endpoint [#3060](https://github.com/opendatateam/udata/pull/3060)
+- Improve URL validation errors [#3063](https://github.com/opendatateam/udata/pull/3063) [#2768](https://github.com/opendatateam/udata/pull/2768)
 
 ## 9.0.0 (2024-06-07)
 

{udata-9.0.1.dev29541.dist-info → udata-9.0.1.dev29597.dist-info}/RECORD

@@ -18,7 +18,7 @@ udata/tags.py,sha256=8MvgyjfUz8O71tCV0V1fQV4_0C2P-SLFrm2IA2QfNDs,595
 udata/tasks.py,sha256=7tdKnwyz2TF3wYbmFEhTjyuthf1vcuyd6WYWvfRLnoM,4964
 udata/terms.md,sha256=nFx978tUQ3vTEv6POykXaZvcQ5e_gcvmO4ZgcfbSWXo,187
 udata/tracking.py,sha256=iaGqN9NCqcEAayemJe9a-3N8fO--ixBXCUvQ7jRxbhA,359
-udata/uris.py,sha256=_RaQSy6ghs2IHJQkDFaYpM2e--VA3p1D6awm5ybueAQ,3489
+udata/uris.py,sha256=sbxCx7v_pn1nOykn_cCdPBCNcVLH3vwZOoA11r_mIFk,3573
 udata/utils.py,sha256=eJ9-RXX9oxDgnZ8DbzYAAjbT7WkKjuSETEfhkaQ7QZo,8373
 udata/worker.py,sha256=K-Wafye5-uXP4kQlffRKws2J9YbJ6m6n2QjcVsY8Nsg,118
 udata/wsgi.py,sha256=P7AJvZ5JqY4uRSBOzaFiBniChWIU9RVQ-Y0PN4vCCMY,77
@@ -262,7 +262,7 @@ udata/features/transfer/models.py,sha256=oItut3YeNJB2Nx_XJ_UBilB0LQF5pZil2Tp6TsG
 udata/features/transfer/notifications.py,sha256=oh_uP0XlEEeT7747A292WkjAjAyO4d0YK28oBICN24Y,1003
 udata/features/transfer/permissions.py,sha256=-iEgQkIfLYDGarhDVp3TMas4ABl_Pc4KJTSP8pcewws,953
 udata/forms/__init__.py,sha256=ZxakXdJMwsM_YFT96Z2X24J5YpbpnP_VZ_VEh15gK3w,820
-udata/forms/fields.py,sha256=WTCAc4KVPS6EanpUPuan_reDM9gwx4K2wdvJBxu_pTY,29129
+udata/forms/fields.py,sha256=MQREJ-oOomJZyBvTD9aY2gCoL-v5vPjPcQuBX-cpABI,29124
 udata/forms/validators.py,sha256=EqCJloDOR3BonrR34N_ZaMGBXr0iuliDc82khc98e20,2816
 udata/forms/widgets.py,sha256=P-D3uYfNH5OhAa-SqNoXROg_DuDlnpv_DaO_e4LcJ5I,1380
 udata/frontend/__init__.py,sha256=Xc71TI6a8b_QR_wqEOc1tty2y1CwHVbV4tS04nElme0,3494
@@ -414,10 +414,10 @@ udata/static/SourceSansPro-SemiboldIt.ttf,sha256=EK3ye-6bT-g3T7TSBW-kaoHWkUtlL3o
 udata/static/SourceSansPro-SemiboldIt.ttf.woff2,sha256=JBtSfqRaYeoVAVQ3ynlAwX-to2RlkE3yAaVkv6-s-NA,44608
 udata/static/admin.css,sha256=RC7GvbVK8c5wDuELPeVdQpy3ab7HbHl1T4hUo5n-NVk,185167
 udata/static/admin.css.map,sha256=tUhFfsJUK3RrWCih9gUkf-Ywccuztxf4tqvXcN6zP3Y,626542
-udata/static/admin.js,sha256=pibxMEOZvT_r3wgxy_xxjG_7Cvl5K8dopynuSfTtY5I,1323379
-udata/static/admin.js.map,sha256=eZi2nYg-FGClH53Kw3LdvYZ0RpgrrdyAgAhZyal_RQ4,8501170
-udata/static/common.js,sha256=Wh1GtlbHXvfy_8_QHjeHKHaQmgz0kbGMON09h4pihQ8,2252
-udata/static/common.js.map,sha256=y_GeKyVW-VKZaPRq8sznQKAs_PzdXqqrps1UvacchL8,14137
+udata/static/admin.js,sha256=5aUMi0yODaA3S72Lx2EfU02rGI1Oq_Y3pkVX4eeTHwc,1323682
+udata/static/admin.js.map,sha256=kZIUAQXjIu-wXYkBsstAAANom2YTUF9foCLSmHbSKjw,8502212
+udata/static/common.js,sha256=hEYMeHMi8xkTJQVmcrzFIl1TWikBiZpF15yPxHvj6NE,2252
+udata/static/common.js.map,sha256=d1tp8ldEiFYyIO93ZJYE4nJ3sdZRQR2UmSkwiKNgMs8,14137
 udata/static/fontawesome-webfont.eot,sha256=e_yrbbmdXPvxcFygU23ceFhUMsxfpBu9etDwCQM7KXk,165742
 udata/static/fontawesome-webfont.svg,sha256=rWFXkmwWIrpOHQPUePFUE2hSS_xG9R5C_g2UX37zI-Q,444379
 udata/static/fontawesome-webfont.ttf,sha256=qljzPyOaD7AvXHpsRcBD16msmgkzNYBmlOzW1O3A1qg,165548
@@ -578,7 +578,7 @@ udata/tests/test_i18n.py,sha256=BU9E7OoIkJw5tv5JYGLjDGBDsti2HuQ_3OWDKnBxnaM,3191
 udata/tests/test_linkchecker.py,sha256=KxV1-PuuuqogkHf3jP6JhRsc2QG2dFmFB-vSHOiHkuU,10374
 udata/tests/test_mail.py,sha256=LK_fOBbFoqbwdaIEXO9XyGPzxY9nrT9FjyD_dlglUdQ,1643
 udata/tests/test_migrations.py,sha256=IG2o13B3sgkfg3PAqrbOTkS2iqGubNxa_JD-LHL9zxc,15317
-udata/tests/test_model.py,sha256=DoJxj5E_jmWMWQXS44XsZ0Fza3ymSQC5yWnekjMXjGs,20287
+udata/tests/test_model.py,sha256=IhhzR7ErjnVHR0qlkk-Iw-NR_ZJe86dfEaxT7Uk4QPE,20357
 udata/tests/test_notifications.py,sha256=El5i56LCn0PwJc1PYx7g8onUk2i47dfjlcdMohCXGAQ,2333
 udata/tests/test_owned.py,sha256=DNgr0iljvzaIPxRvYLG2nx6V3ADp0U8SEW0xj4nYieM,5662
 udata/tests/test_rdf.py,sha256=osRAX9U9v5Hm3Tar-FqKUe7wCuTx4jHI7sYJxJVIhaQ,2813
@@ -594,7 +594,7 @@ udata/tests/api/test_auth_api.py,sha256=3Zhn2A29poZIcCJ_R9_-LkR3xOFUTw1aTquiZVXQ
 udata/tests/api/test_base_api.py,sha256=DRX5nuFIj51GFmMIAxUzoW1yiq1apNgr1vS4U4agzeg,2319
 udata/tests/api/test_contact_points.py,sha256=MJm8B06iaUqIZCqxll3NViFwUCxwqZZ4u9e9s1h8MgU,1056
 udata/tests/api/test_dataservices_api.py,sha256=51NU5d4iqfJT8iiyi0aLdWXDqZLvmyD-qh-Sflk9Lsg,11122
-udata/tests/api/test_datasets_api.py,sha256=zqRtC61NvYUNum4kBTjA1W87JAIobA4k564rm-U6c98,81704
+udata/tests/api/test_datasets_api.py,sha256=aC5bFhaoILoFEZFc8JXESdoOz-mf0e797zPmwzJ9FP0,81711
 udata/tests/api/test_fields.py,sha256=OW85Z5MES5HeWOpapeem8OvR1cIcrqW-xMWpdZO4LZ8,1033
 udata/tests/api/test_follow_api.py,sha256=0h54P_Dfbo07u6tg0Rbai1WWgWb19ZLN2HGv4oLCWfg,3383
 udata/tests/api/test_me_api.py,sha256=8OthqVYQKZrFoGuJ7zAvoLJx1IclPNzPdD5Tnzmh3rM,14163
@@ -673,24 +673,24 @@ udata/tests/workers/test_jobs_commands.py,sha256=0Ru2N-uxgWAgYoADxFjLgyburD5OdBL
 udata/tests/workers/test_tasks_routing.py,sha256=4cBChvphj23rbLIu4dCTYYiM5OfTEUZKlXuNnyBCnWA,2260
 udata/tests/workers/test_workers_api.py,sha256=8MtfAjrPL1TUfEBfVjrYfm_4rft4DfBlcamiVvMCJAo,8863
 udata/tests/workers/test_workers_helpers.py,sha256=EVTHL-KhwbwD8snfN8HdK5o-wMXYkl2oXgtl990fQxE,647
-udata/translations/udata.pot,sha256=hLiWR_W3yGBIIp0gUv5kKeUZ5Qjsg5qlZ0FdJr7dUv4,35755
-udata/translations/ar/LC_MESSAGES/udata.mo,sha256=Jr1AT69U_wYPVYV4q1KfF4raMAcy_iTCpCvn9uYM8Ic,12665
-udata/translations/ar/LC_MESSAGES/udata.po,sha256=I8Y6gAMqh3b9uB_EGDHUOOmmRaX6ieK4OYeckHxrB_M,41173
-udata/translations/de/LC_MESSAGES/udata.mo,sha256=rUsRH37tTAlQsP3YpatJjOUvWLfLnJMrlTFPPpm34mk,16061
-udata/translations/de/LC_MESSAGES/udata.po,sha256=1cDZ4UoXD5-vLRhaIiji_maGKKtIq3vjlswgeRo3pZg,41635
-udata/translations/es/LC_MESSAGES/udata.mo,sha256=OWaYtp3tqefD8jhkmuvc8KMWkTuJI8-s4tN8LT5RK1o,12914
-udata/translations/es/LC_MESSAGES/udata.po,sha256=g9cZziNwYS_ApFHi5q5q-KNiNBgxzx-zpQdvZC2-bnA,40590
-udata/translations/fr/LC_MESSAGES/udata.mo,sha256=xrLGyfoHIZEdE2frPOQNokMpOUKp1ho88jEtrzWyMH4,27690
-udata/translations/fr/LC_MESSAGES/udata.po,sha256=ZdViHCrMdg23IAnNopnS7D-39fx2uwwR6K6xK9KwId0,47328
-udata/translations/it/LC_MESSAGES/udata.mo,sha256=nNkVYZ0FKRNPaQvCW9wZkaTAmB19NmHmujzgsthR5Lo,15882
-udata/translations/it/LC_MESSAGES/udata.po,sha256=Lrg7ZZBWnbdtKzohlzMkBO402tEEAMqanJgHEhPZ62c,41431
-udata/translations/pt/LC_MESSAGES/udata.mo,sha256=uttB2K8VsqzkEQG-5HfTtFms_3LtV9iZ24wIkLBn2GU,21091
-udata/translations/pt/LC_MESSAGES/udata.po,sha256=8Ql1Lp7Z9KLnvp-qRxw-NhFu1p35Xj-q6Jg9JHsYhcw,43733
-udata/translations/sr/LC_MESSAGES/udata.mo,sha256=US8beNIMPxP5h-zD_jfP1TheDDd4DdRVS5UIiY5XVZ8,28553
-udata/translations/sr/LC_MESSAGES/udata.po,sha256=TM0yMDvKRljyOzgZZMlTX6OfpF6OC4Ngf_9Zc8n6ayA,50313
-udata-9.0.1.dev29541.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
-udata-9.0.1.dev29541.dist-info/METADATA,sha256=t2_41zw2yErvhP9OOAkdRHcppLFCKqDXs1izTOat-kI,124703
-udata-9.0.1.dev29541.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
-udata-9.0.1.dev29541.dist-info/entry_points.txt,sha256=3SKiqVy4HUqxf6iWspgMqH8d88Htk6KoLbG1BU-UddQ,451
-udata-9.0.1.dev29541.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
-udata-9.0.1.dev29541.dist-info/RECORD,,
+udata/translations/udata.pot,sha256=COdV87EQCmi-xh4woWqErwbnzlW9a5a2xo-6UVkPDZs,36594
+udata/translations/ar/LC_MESSAGES/udata.mo,sha256=5WY0IWxqGknbC1o3BBRwTRg81ATBT9wLJHb3dK3piek,12665
+udata/translations/ar/LC_MESSAGES/udata.po,sha256=VjT4qh3z_xO1Sh0EjVW6Ffms17flM52btum1CXGXVIU,42012
+udata/translations/de/LC_MESSAGES/udata.mo,sha256=XPDFo3LbWnAUxIhtN0Y__aUMfKX6rKM4IQSlasUUhTE,16061
+udata/translations/de/LC_MESSAGES/udata.po,sha256=k4RKdWzsCnuwfDYcf2lGnxOScJpRoVZ-7qkzH2qOb5s,42474
+udata/translations/es/LC_MESSAGES/udata.mo,sha256=RE2DCXV5g7-WlkoUdC6AUYxQL7uYlbTx3pSPMgGXc28,12914
+udata/translations/es/LC_MESSAGES/udata.po,sha256=A2xcTGEMB3F28thDWAXs4xZUqY1-OBCtFrpWoc0Gumg,41429
+udata/translations/fr/LC_MESSAGES/udata.mo,sha256=0B5SQVTft8mw0EmiqQJbXKC2iIQZRwXwAOWxgt32ggc,27690
+udata/translations/fr/LC_MESSAGES/udata.po,sha256=Pdi_o32nVjEfXtLML197ckqgpgK9m24iB_6bilf-qWY,48167
+udata/translations/it/LC_MESSAGES/udata.mo,sha256=Y5ef6_0rkS8X8YgevSwGUhw1i46YROnkTUrfGAS1rRI,15882
+udata/translations/it/LC_MESSAGES/udata.po,sha256=BFXbw5YApm-3PnZZy4PEPwogVp4hQ5c-oqxhNfaUVoQ,42270
+udata/translations/pt/LC_MESSAGES/udata.mo,sha256=iAUNwbI8ESi8MHkE3ZCYCSIXfFC27zeteFw4CH0tgjw,21091
+udata/translations/pt/LC_MESSAGES/udata.po,sha256=uTmbHfzyFWrVXUkKSuNFzbGpX7EkUuBdD8fE04d3v5g,44572
+udata/translations/sr/LC_MESSAGES/udata.mo,sha256=1MbQHvKKNUwzMBWLNsH1qqBehO3aILhQiMhi5u1bY8E,28553
+udata/translations/sr/LC_MESSAGES/udata.po,sha256=AAryt27Gbkhk7FntCCU8_e7HSXATfsAQhwFOFC8CAj0,51152
+udata-9.0.1.dev29597.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
+udata-9.0.1.dev29597.dist-info/METADATA,sha256=s5QXv0hRAr_AqGTjLWohlMcIZ1tCF3XB0T_ml10ek1o,124849
+udata-9.0.1.dev29597.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
+udata-9.0.1.dev29597.dist-info/entry_points.txt,sha256=3SKiqVy4HUqxf6iWspgMqH8d88Htk6KoLbG1BU-UddQ,451
+udata-9.0.1.dev29597.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
+udata-9.0.1.dev29597.dist-info/RECORD,,