From e17418529575c2934b0e0cc72cdf96355531799d Mon Sep 17 00:00:00 2001 From: Maksim Sadym Date: Fri, 29 Aug 2025 16:31:12 +0200 Subject: [PATCH 1/7] Inline "proxy" string configuration with Chromium implementation --- index.html | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/index.html b/index.html index a35c9cd4..7ada05cf 100644 --- a/index.html +++ b/index.html @@ -1623,8 +1623,7 @@

Proxy

string Defines the proxy host for HTTP traffic when the proxyType is "manual". - A host and optional port for - scheme "http". + A proxy url. @@ -1640,8 +1639,7 @@

Proxy

string Defines the proxy host for encrypted TLS traffic when the proxyType is "manual". - A host and optional port for - scheme "https". + A proxy url. @@ -1649,7 +1647,7 @@

Proxy

string Defines the proxy host for a SOCKS proxy when the proxyType is "manual". - A host and optional port with an undefined scheme. + A proxy url. @@ -1662,12 +1660,14 @@

Proxy

-

A host and optional port for a scheme is - defined as being a valid host, optionally followed by a colon - and a valid port. The host may +

A proxy url is a valid host, optionally followed by a colon + and a valid port, and optionally prefixed by a scheme and + "://" string. The host may include credentials. If the - port is omitted and scheme has a default port, - this is the implied port. Otherwise, the port is left undefined. + scheme is omitted, the scheme is implied to be + "http". If the port is omitted and scheme has a + default port, this is the implied port. Otherwise, the port is left + undefined.

A proxyType of "direct" indicates that the browser should not use a proxy at all. From 5948bb357445026adb7f28adf36023da75d7dbee Mon Sep 17 00:00:00 2001 From: Maksim Sadym Date: Fri, 29 Aug 2025 16:55:42 +0200 Subject: [PATCH 2/7] restrict proxy schema --- index.html | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/index.html b/index.html index 7ada05cf..58ace680 100644 --- a/index.html +++ b/index.html @@ -1645,7 +1645,7 @@

Proxy

socksProxy string - Defines the proxy host for a SOCKS proxy + (deprecated) defines the proxy host for a SOCKS proxy when the proxyType is "manual". A proxy url. @@ -1653,22 +1653,34 @@

Proxy

socksVersion number - Defines the SOCKS proxy version + (deprecated) defines the SOCKS proxy version when the proxyType is "manual". Any integer between 0 and 255 inclusive. + + other + string + Defines the proxy for traffic which is not HTTP nor TLS + when the proxyType is "manual". + A proxy url. + +

A proxy url is a valid host, optionally followed by a colon - and a valid port, and optionally prefixed by a scheme and - "://" string. The host may + and a valid port, and optionally prefixed by a proxy schema + scheme and "://" string. The host may include credentials. If the scheme is omitted, the scheme is implied to be "http". If the port is omitted and scheme has a default port, this is the implied port. Otherwise, the port is left undefined. +

A proxy schema is defined as being one of the following strings: + "http", "https", "socks4", + "socks5". +

A proxyType of "direct" indicates that the browser should not use a proxy at all. From 17a66af0b88e2a60ff211cb89c3636f1e98ac0c0 Mon Sep 17 00:00:00 2001 From: Maksim Sadym Date: Fri, 29 Aug 2025 17:14:41 +0200 Subject: [PATCH 3/7] roll back socksProxy --- index.html | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/index.html b/index.html index 58ace680..2ce6bff6 100644 --- a/index.html +++ b/index.html @@ -1645,27 +1645,11 @@

Proxy

socksProxy string - (deprecated) defines the proxy host for a SOCKS proxy + Defines the proxy host for a SOCKS proxy when the proxyType is "manual". A proxy url. - - socksVersion - number - (deprecated) defines the SOCKS proxy version - when the proxyType is "manual". - Any integer between 0 and 255 inclusive. - - - - other - string - Defines the proxy for traffic which is not HTTP nor TLS - when the proxyType is "manual". - A proxy url. - -

A proxy url is a valid host, optionally followed by a colon From 7d5457a80bfc845bf5f865566830e9b3d55221e7 Mon Sep 17 00:00:00 2001 From: Maksim Sadym Date: Fri, 12 Sep 2025 13:12:28 +0200 Subject: [PATCH 4/7] schemas --- index.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/index.html b/index.html index 2ce6bff6..8e13177d 100644 --- a/index.html +++ b/index.html @@ -1652,9 +1652,9 @@

Proxy

-

A proxy url is a valid host, optionally followed by a colon - and a valid port, and optionally prefixed by a proxy schema - scheme and "://" string. The host may +

A proxy url is an optional proxy schema and + "://" string, followed by a valid host, optionally + followed by a colon and a valid port. The host may include credentials. If the scheme is omitted, the scheme is implied to be "http". If the port is omitted and scheme has a @@ -1662,8 +1662,8 @@

Proxy

undefined.

A proxy schema is defined as being one of the following strings: - "http", "https", "socks4", - "socks5". + "http", "https", "socks", + "socks4", "socks5".

A proxyType of "direct" indicates that the browser should not use a proxy at all. From 13ea27d36166ba567e5e87f8dd3dd7b2ca7b5bf0 Mon Sep 17 00:00:00 2001 From: Maksim Sadym <69349599+sadym-chromium@users.noreply.github.com> Date: Wed, 1 Oct 2025 10:16:00 +0200 Subject: [PATCH 5/7] Update index.html Co-authored-by: Henrik Skupin --- index.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/index.html b/index.html index 8e13177d..e317d912 100644 --- a/index.html +++ b/index.html @@ -1652,10 +1652,10 @@

Proxy

-

A proxy url is an optional proxy schema and - "://" string, followed by a valid host, optionally - followed by a colon and a valid port. The host may - include credentials. If the +

A proxy url consists of an optional proxy scheme +followed by the string "://", a valid host, +and optionally a colon followed by a valid port. The host +may include credentials. If the scheme is omitted, the scheme is implied to be "http". If the port is omitted and scheme has a default port, this is the implied port. Otherwise, the port is left From 7104d7709d116590e940f4b9cdec100bbfd9cb47 Mon Sep 17 00:00:00 2001 From: Maksim Sadym Date: Wed, 1 Oct 2025 10:34:05 +0200 Subject: [PATCH 6/7] s/schema/scheme --- index.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/index.html b/index.html index e317d912..da56574a 100644 --- a/index.html +++ b/index.html @@ -1652,16 +1652,16 @@

Proxy

-

A proxy url consists of an optional proxy scheme -followed by the string "://", a valid host, -and optionally a colon followed by a valid port. The host +

A proxy url consists of an optional proxy scheme +followed by the string "://", a valid host, +and optionally a colon followed by a valid port. The host may include credentials. If the scheme is omitted, the scheme is implied to be "http". If the port is omitted and scheme has a default port, this is the implied port. Otherwise, the port is left undefined. -

A proxy schema is defined as being one of the following strings: +

A proxy scheme is defined as being one of the following strings: "http", "https", "socks", "socks4", "socks5". From d4a15339121cf2b2d6784a4a5f57cefb34e08d61 Mon Sep 17 00:00:00 2001 From: Maksim Sadym Date: Wed, 1 Oct 2025 11:43:31 +0200 Subject: [PATCH 7/7] `socksVersion` defines the protocol version for `socks` protocol --- index.html | 44 ++++++++++++++++++++++++++++++-------------- 1 file changed, 30 insertions(+), 14 deletions(-) diff --git a/index.html b/index.html index da56574a..fbce0e9e 100644 --- a/index.html +++ b/index.html @@ -1645,21 +1645,37 @@

Proxy

socksProxy string - Defines the proxy host for a SOCKS proxy - when the proxyType is "manual". + Defines the proxy host for SOCKS traffic when the + proxyType is "manual". A proxy url. + + socksVersion + number + Defines the SOCKS proxy version when the proxy url's + proxy scheme is "socks". + Any integer between 0 and 255 inclusive. + + -

A proxy url consists of an optional proxy scheme -followed by the string "://", a valid host, -and optionally a colon followed by a valid port. The host -may include credentials. If the - scheme is omitted, the scheme is implied to be - "http". If the port is omitted and scheme has a - default port, this is the implied port. Otherwise, the port is left - undefined. +

A proxy url can be either "direct" or a string + consists of an optional proxy scheme scheme followed by the + string "://", a valid host host, and optionally + a colon followed by a valid port port. + +

    +

  1. The host may + include credentials. +

  2. If the port is omitted and scheme has a + default port, this is the implied port. Otherwise, the port + is left undefined. + +

  3. If the scheme is omitted and the port is 443, + the scheme is implied to be "https". Otherwise, the + scheme is implied to be "http". +

A proxy scheme is defined as being one of the following strings: "http", "https", "socks", @@ -1716,10 +1732,10 @@

Proxy

own property for "proxyAutoconfigUrl" return an error with error code invalid argument. -

  • If proxy has an own property for - "socksProxy" and does not have an own property - for "socksVersion" return an error with error - code invalid argument. +

  • If proxy contains proxy url with proxy scheme + "socks" and does not have an own property + for "socksVersion", return an error with error code + invalid argument.

  • Return success with data proxy.