public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
* [pve-devel] [PATCH manager 0/2] ui: storage oci pull: optimize and cleanup reference regex
@ 2025-11-19 13:28 Filip Schauer
  2025-11-19 13:28 ` [pve-devel] [PATCH manager 1/2] ui: storage oci pull: optimize " Filip Schauer
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Filip Schauer @ 2025-11-19 13:28 UTC (permalink / raw)
  To: pve-devel

Filip Schauer (2):
  ui: storage oci pull: optimize reference regex
  ui: storage oci pull: split up long one-line regex

 www/manager6/storage/TemplateView.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

-- 
2.47.3



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel


^ permalink raw reply	[flat|nested] 4+ messages in thread

* [pve-devel] [PATCH manager 1/2] ui: storage oci pull: optimize reference regex
  2025-11-19 13:28 [pve-devel] [PATCH manager 0/2] ui: storage oci pull: optimize and cleanup reference regex Filip Schauer
@ 2025-11-19 13:28 ` Filip Schauer
  2025-11-19 13:28 ` [pve-devel] [PATCH manager 2/2] ui: storage oci pull: split up long one-line regex Filip Schauer
  2025-11-19 13:55 ` [pve-devel] superseded [PATCH manager 0/2] ui: storage oci pull: optimize and cleanup reference regex Filip Schauer
  2 siblings, 0 replies; 4+ messages in thread
From: Filip Schauer @ 2025-11-19 13:28 UTC (permalink / raw)
  To: pve-devel

Simplify the regex used to match an OCI registry reference and avoid
catastrophic backtracking in cases such as:
"registry.fedoraproject.org/fedora:"

Signed-off-by: Filip Schauer <f.schauer@proxmox.com>
---
 www/manager6/storage/TemplateView.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/manager6/storage/TemplateView.js b/www/manager6/storage/TemplateView.js
index 9f313a0c..71a68b88 100644
--- a/www/manager6/storage/TemplateView.js
+++ b/www/manager6/storage/TemplateView.js
@@ -218,11 +218,11 @@ Ext.define('PVE.storage.OciRegistryPull', {
 
         parseReference: function (value) {
             const re =
-                /^((?:(?:[a-zA-Z\d]|[a-zA-Z\d][a-zA-Z\d-]*[a-zA-Z\d])(?:\.(?:[a-zA-Z\d]|[a-zA-Z\d][a-zA-Z\d-]*[a-zA-Z\d]))*(?::\d+)?\/)?[a-z\d]+(?:(?:[._]|__|[-]*)[a-z\d]+)*(?:\/[a-z\d]+(?:(?:[._]|__|[-]*)[a-z\d]+)*)*)(:(\w[\w.-]{0,127}))?$/;
+                /^((?:[a-zA-Z\d](?:[a-zA-Z\d-]*[a-zA-Z\d])?(?:\.(?:[a-zA-Z\d](?:[a-zA-Z\d-]*[a-zA-Z\d])?))*(?::\d+)?\/)?[a-z\d]+(?:(?:[._]|__|-+)[a-z\d]+)*(?:\/[a-z\d]+(?:(?:[._]|__|-+)[a-z\d]+)*)*)(?::(\w[\w.-]{0,127}))?$/;
             let matches = value.match(re);
             if (matches) {
                 let ref = matches[1];
-                let tag = matches[3];
+                let tag = matches[2];
                 return [ref, tag];
             }
             return undefined;
-- 
2.47.3



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel


^ permalink raw reply	[flat|nested] 4+ messages in thread

* [pve-devel] [PATCH manager 2/2] ui: storage oci pull: split up long one-line regex
  2025-11-19 13:28 [pve-devel] [PATCH manager 0/2] ui: storage oci pull: optimize and cleanup reference regex Filip Schauer
  2025-11-19 13:28 ` [pve-devel] [PATCH manager 1/2] ui: storage oci pull: optimize " Filip Schauer
@ 2025-11-19 13:28 ` Filip Schauer
  2025-11-19 13:55 ` [pve-devel] superseded [PATCH manager 0/2] ui: storage oci pull: optimize and cleanup reference regex Filip Schauer
  2 siblings, 0 replies; 4+ messages in thread
From: Filip Schauer @ 2025-11-19 13:28 UTC (permalink / raw)
  To: pve-devel

Signed-off-by: Filip Schauer <f.schauer@proxmox.com>
---
 www/manager6/storage/TemplateView.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/www/manager6/storage/TemplateView.js b/www/manager6/storage/TemplateView.js
index 71a68b88..a7e1dbcc 100644
--- a/www/manager6/storage/TemplateView.js
+++ b/www/manager6/storage/TemplateView.js
@@ -217,8 +217,12 @@ Ext.define('PVE.storage.OciRegistryPull', {
         },
 
         parseReference: function (value) {
-            const re =
-                /^((?:[a-zA-Z\d](?:[a-zA-Z\d-]*[a-zA-Z\d])?(?:\.(?:[a-zA-Z\d](?:[a-zA-Z\d-]*[a-zA-Z\d])?))*(?::\d+)?\/)?[a-z\d]+(?:(?:[._]|__|-+)[a-z\d]+)*(?:\/[a-z\d]+(?:(?:[._]|__|-+)[a-z\d]+)*)*)(?::(\w[\w.-]{0,127}))?$/;
+            const re = new RegExp(
+                '^((?:[a-zA-Z\\d](?:[a-zA-Z\\d-]*[a-zA-Z\\d])?(?:\\.(?:[a-zA-Z\\d]' +
+                '(?:[a-zA-Z\\d-]*[a-zA-Z\\d])?))*(?::\\d+)?\\/)?[a-z\\d]+(?:(?:[._]|__|-+)' +
+                '[a-z\\d]+)*(?:\\/[a-z\\d]+(?:(?:[._]|__|-+)[a-z\\d]+)*)*)' +
+                '(?::(\\w[\\w.-]{0,127}))?$'
+            );
             let matches = value.match(re);
             if (matches) {
                 let ref = matches[1];
-- 
2.47.3



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [pve-devel] superseded [PATCH manager 0/2] ui: storage oci pull: optimize and cleanup reference regex
  2025-11-19 13:28 [pve-devel] [PATCH manager 0/2] ui: storage oci pull: optimize and cleanup reference regex Filip Schauer
  2025-11-19 13:28 ` [pve-devel] [PATCH manager 1/2] ui: storage oci pull: optimize " Filip Schauer
  2025-11-19 13:28 ` [pve-devel] [PATCH manager 2/2] ui: storage oci pull: split up long one-line regex Filip Schauer
@ 2025-11-19 13:55 ` Filip Schauer
  2 siblings, 0 replies; 4+ messages in thread
From: Filip Schauer @ 2025-11-19 13:55 UTC (permalink / raw)
  To: pve-devel

On 19/11/2025 14:27, Filip Schauer wrote:
> Filip Schauer (2):
>    ui: storage oci pull: optimize reference regex
>    ui: storage oci pull: split up long one-line regex
>
>   www/manager6/storage/TemplateView.js | 10 +++++++---
>   1 file changed, 7 insertions(+), 3 deletions(-)
>
Superseded by:
https://lore.proxmox.com/pve-devel/20251119135323.102447-1-f.schauer@proxmox.com/T



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel


^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2025-11-19 13:55 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-11-19 13:28 [pve-devel] [PATCH manager 0/2] ui: storage oci pull: optimize and cleanup reference regex Filip Schauer
2025-11-19 13:28 ` [pve-devel] [PATCH manager 1/2] ui: storage oci pull: optimize " Filip Schauer
2025-11-19 13:28 ` [pve-devel] [PATCH manager 2/2] ui: storage oci pull: split up long one-line regex Filip Schauer
2025-11-19 13:55 ` [pve-devel] superseded [PATCH manager 0/2] ui: storage oci pull: optimize and cleanup reference regex Filip Schauer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal