Skip to content

feat: add HTTP caching for PAC fetch using httpcache (RFC 9111 compli… #171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Sneha41sb wants to merge 3 commits into
base: master
Choose a base branch
from
Open

feat: add HTTP caching for PAC fetch using httpcache (RFC 9111 compli… #171

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9f6d13c
feat: add HTTP caching for PAC fetch using httpcache (RFC 9111 compli…
Sneha41sb Mar 22, 2026
63a249b
fix: use in-memory cache, restore comments, add test for no cache fal…
Sneha41sb Mar 25, 2026
f2b95bb
fix: restore license header, use in-memory cache, add test for no cac…
Sneha41sb Mar 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions blocklist_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@ func TestBlocklistDuplicateEntry(t *testing.T) {
var now time.Time
b.now = func() time.Time { return now }
b.add("foo")
now = now.Add(3*time.Minute)
now = now.Add(3 * time.Minute)
b.add("foo")
now = now.Add(3*time.Minute)
now = now.Add(3 * time.Minute)
b.contains("foo")
now = now.Add(3*time.Minute)
now = now.Add(3 * time.Minute)
b.contains("foo")
}
9 changes: 9 additions & 0 deletions cache/0716f3ab870e959af20406c6536d3d17bd596741d98fde544020a664e61f0bee
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
HTTP/1.1 200 OK
Content-Length: 11
Content-Type: text/plain; charset=utf-8
Date: Sun, 22 Mar 2026 16:54:14 GMT
X-Cached-Time: 2026-03-22T16:54:14Z
X-Request-Time: 2026-03-22T16:54:14Z
X-Response-Time: 2026-03-22T16:54:14Z

test script
9 changes: 9 additions & 0 deletions cache/074e5a0e00e010a2d81ea649fc5af4d7096f84fc9ffbb0eb4555f3d027da0522
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
HTTP/1.1 200 OK
Content-Length: 82
Content-Type: text/plain; charset=utf-8
Date: Sun, 22 Mar 2026 16:54:15 GMT
X-Cached-Time: 2026-03-22T16:54:15Z
X-Request-Time: 2026-03-22T16:54:15Z
X-Response-Time: 2026-03-22T16:54:15Z

function FindProxyForURL(url, host) { return "PROXY primary:80; PROXY backup:80" }
9 changes: 9 additions & 0 deletions cache/15b10d57edada9c4a5b5ddc504987316efb692c524d4dd35b20fd1f0492257f2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
HTTP/1.1 200 OK
Content-Length: 55
Content-Type: text/plain; charset=utf-8
Date: Sun, 22 Mar 2026 16:59:16 GMT
X-Cached-Time: 2026-03-22T16:59:16Z
X-Request-Time: 2026-03-22T16:59:16Z
X-Response-Time: 2026-03-22T16:59:16Z

function FindProxyForURL(url, host) { return 'DIRECT' }
9 changes: 9 additions & 0 deletions cache/18cb3815cbdd992ef2820b068e6f36fb769046991baa137b7c412968d27e66f4
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
HTTP/1.1 200 OK
Content-Length: 82
Content-Type: text/plain; charset=utf-8
Date: Sun, 22 Mar 2026 16:59:16 GMT
X-Cached-Time: 2026-03-22T16:59:16Z
X-Request-Time: 2026-03-22T16:59:16Z
X-Response-Time: 2026-03-22T16:59:16Z

function FindProxyForURL(url, host) { return "PROXY primary:80; PROXY backup:80" }
9 changes: 9 additions & 0 deletions cache/20fbf45e880549fbffb4f8d3574042011b3151afd101f10edb288ea7649bd2f5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
HTTP/1.1 200 OK
Content-Length: 63
Content-Type: text/plain; charset=utf-8
Date: Sun, 22 Mar 2026 16:54:15 GMT
X-Cached-Time: 2026-03-22T16:54:15Z
X-Request-Time: 2026-03-22T16:54:15Z
X-Response-Time: 2026-03-22T16:54:15Z

function FindProxyForURL(url, host) { return 'HTTP http.test' }
9 changes: 9 additions & 0 deletions cache/2a9f4090ba4831a55edf223baa34cb0b7bbd3d8c244cb0ff7f5d4e1589f5a872
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
HTTP/1.1 200 OK
Content-Length: 11
Content-Type: text/plain; charset=utf-8
Date: Sun, 22 Mar 2026 16:59:15 GMT
X-Cached-Time: 2026-03-22T16:59:15Z
X-Request-Time: 2026-03-22T16:59:15Z
X-Response-Time: 2026-03-22T16:59:15Z

test script
9 changes: 9 additions & 0 deletions cache/31a27abdf1945ccca5ca30ad075b1cbbbda7ed8e9ca0ac881f02e4b2419f30c1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
HTTP/1.1 200 OK
Content-Length: 69
Content-Type: text/plain; charset=utf-8
Date: Sun, 22 Mar 2026 16:54:15 GMT
X-Cached-Time: 2026-03-22T16:54:15Z
X-Request-Time: 2026-03-22T16:54:15Z
X-Response-Time: 2026-03-22T16:54:15Z

function FindProxyForURL(url, host) { return 'INVALID RETURN VALUE' }
9 changes: 9 additions & 0 deletions cache/44be16e46a43d423465a067f20cb9b527c128a57439cab2657d8f1a1dba87545
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
HTTP/1.1 200 OK
Content-Length: 13
Content-Type: text/plain; charset=utf-8
Date: Sun, 22 Mar 2026 16:59:15 GMT
X-Cached-Time: 2026-03-22T16:59:15Z
X-Request-Time: 2026-03-22T16:59:15Z
X-Response-Time: 2026-03-22T16:59:15Z

test script 2
9 changes: 9 additions & 0 deletions cache/55f99a8adc533969548ea2f6ea09517bb10094147f1d95d8cc0b0b110a7a37fb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
HTTP/1.1 200 OK
Content-Length: 72
Content-Type: text/plain; charset=utf-8
Date: Sun, 22 Mar 2026 16:54:15 GMT
X-Cached-Time: 2026-03-22T16:54:15Z
X-Request-Time: 2026-03-22T16:54:15Z
X-Response-Time: 2026-03-22T16:54:15Z

function FindProxyForURL(url, host) { return 'SOCKS socksproxy.test:3' }
9 changes: 9 additions & 0 deletions cache/55feb950dc833672a030dddafe6127fada0536749d7a820559af1b4e56d742cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
HTTP/1.1 200 OK
Content-Length: 65
Content-Type: text/plain; charset=utf-8
Date: Sun, 22 Mar 2026 16:59:16 GMT
X-Cached-Time: 2026-03-22T16:59:16Z
X-Request-Time: 2026-03-22T16:59:16Z
X-Response-Time: 2026-03-22T16:59:16Z

function FindProxyForURL(url, host) { return 'HTTP http.test:4' }
9 changes: 9 additions & 0 deletions cache/5b5ceeee8a772dc07c0ccb2b9159ac2645db9597b9897dce91ee47a2b1d063e8
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
HTTP/1.1 200 OK
Content-Length: 72
Content-Type: text/plain; charset=utf-8
Date: Sun, 22 Mar 2026 16:59:16 GMT
X-Cached-Time: 2026-03-22T16:59:16Z
X-Request-Time: 2026-03-22T16:59:16Z
X-Response-Time: 2026-03-22T16:59:16Z

function FindProxyForURL(url, host) { return 'SOCKS socksproxy.test:3' }
9 changes: 9 additions & 0 deletions cache/5fd83d919248b288f0abd304305c8196de304e02df02406db3e78ffa679e9d0a
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
HTTP/1.1 200 OK
Content-Length: 65
Content-Type: text/plain; charset=utf-8
Date: Sun, 22 Mar 2026 16:59:16 GMT
X-Cached-Time: 2026-03-22T16:59:16Z
X-Request-Time: 2026-03-22T16:59:16Z
X-Response-Time: 2026-03-22T16:59:16Z

function FindProxyForURL(url, host) { return 'HTTPS https.test' }
9 changes: 9 additions & 0 deletions cache/60277959754a368c77d7321c33a6fca382a5976985b3d31ec2205a7a55d4539f
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
HTTP/1.1 200 OK
Content-Length: 11
Content-Type: text/plain; charset=utf-8
Date: Sun, 22 Mar 2026 16:54:14 GMT
X-Cached-Time: 2026-03-22T16:54:14Z
X-Request-Time: 2026-03-22T16:54:14Z
X-Response-Time: 2026-03-22T16:54:14Z

test script
9 changes: 9 additions & 0 deletions cache/63d271dadd7e8ddb9a67e8d4e5a3a19c16f81490e576f006b497db1cc52cc3ce
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
HTTP/1.1 200 OK
Content-Length: 65
Content-Type: text/plain; charset=utf-8
Date: Sun, 22 Mar 2026 16:59:16 GMT
X-Cached-Time: 2026-03-22T16:59:16Z
X-Request-Time: 2026-03-22T16:59:16Z
X-Response-Time: 2026-03-22T16:59:16Z

function FindProxyForURL(url, host) { return 'PROXY proxy.test' }
9 changes: 9 additions & 0 deletions cache/800e722d8032e0be2423f37bf8642ba4a8d3365cb9a2f2ef410959fff2f2db0d
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
HTTP/1.1 200 OK
Content-Length: 67
Content-Type: text/plain; charset=utf-8
Date: Sun, 22 Mar 2026 16:59:16 GMT
X-Cached-Time: 2026-03-22T16:59:16Z
X-Request-Time: 2026-03-22T16:59:16Z
X-Response-Time: 2026-03-22T16:59:16Z

function FindProxyForURL(url, host) { return 'HTTPS https.test:5' }
9 changes: 9 additions & 0 deletions cache/8d3d144c7b2218faef294a0011957f2ae8f5c3cd1225c7a567ecb05379c85327
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
HTTP/1.1 200 OK
Content-Length: 11
Content-Type: text/plain; charset=utf-8
Date: Sun, 22 Mar 2026 16:59:15 GMT
X-Cached-Time: 2026-03-22T16:59:15Z
X-Request-Time: 2026-03-22T16:59:15Z
X-Response-Time: 2026-03-22T16:59:15Z

test script
9 changes: 9 additions & 0 deletions cache/8e9ccc650f849447ed6bcea044dad6e75eb1eed6c98a8578137dc70d611ff73c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
HTTP/1.1 200 OK
Content-Length: 65
Content-Type: text/plain; charset=utf-8
Date: Sun, 22 Mar 2026 16:54:15 GMT
X-Cached-Time: 2026-03-22T16:54:15Z
X-Request-Time: 2026-03-22T16:54:15Z
X-Response-Time: 2026-03-22T16:54:15Z

function FindProxyForURL(url, host) { return 'PROXY proxy.test' }
9 changes: 9 additions & 0 deletions cache/961e3f7d3b00fac3cee4d9f6ace13021bd143d4c43715107131d477a209d8d92
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
HTTP/1.1 200 OK
Content-Length: 55
Content-Type: text/plain; charset=utf-8
Date: Sun, 22 Mar 2026 16:54:15 GMT
X-Cached-Time: 2026-03-22T16:54:15Z
X-Request-Time: 2026-03-22T16:54:15Z
X-Response-Time: 2026-03-22T16:54:15Z

function FindProxyForURL(url, host) { return 'DIRECT' }
9 changes: 9 additions & 0 deletions cache/97828ecddaf34856f751396d71ec9cd5e48a82373e278e667cf693a6dc4f642c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
HTTP/1.1 200 OK
Content-Length: 65
Content-Type: text/plain; charset=utf-8
Date: Sun, 22 Mar 2026 16:54:15 GMT
X-Cached-Time: 2026-03-22T16:54:15Z
X-Request-Time: 2026-03-22T16:54:15Z
X-Response-Time: 2026-03-22T16:54:15Z

function FindProxyForURL(url, host) { return 'HTTP http.test:4' }
9 changes: 9 additions & 0 deletions cache/a834bbd32367a0265f0d4f07443923ab825ca5e13461110e666ce231c10d34f5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
HTTP/1.1 200 OK
Content-Length: 63
Content-Type: text/plain; charset=utf-8
Date: Sun, 22 Mar 2026 16:59:16 GMT
X-Cached-Time: 2026-03-22T16:59:16Z
X-Request-Time: 2026-03-22T16:59:16Z
X-Response-Time: 2026-03-22T16:59:16Z

function FindProxyForURL(url, host) { return 'HTTP http.test' }
9 changes: 9 additions & 0 deletions cache/b8fdfed15fc3f345f5a44d3fd38b251ea61ace6df9dd74b16ec011f4ef91fb64
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
HTTP/1.1 200 OK
Content-Length: 67
Content-Type: text/plain; charset=utf-8
Date: Sun, 22 Mar 2026 16:54:15 GMT
X-Cached-Time: 2026-03-22T16:54:15Z
X-Request-Time: 2026-03-22T16:54:15Z
X-Response-Time: 2026-03-22T16:54:15Z

function FindProxyForURL(url, host) { return 'HTTPS https.test:5' }
9 changes: 9 additions & 0 deletions cache/b9ae80258cc064d16ba6fbd23836f6e312b29624b9cf933a3a44d7c767a7eb7f
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
HTTP/1.1 200 OK
Content-Length: 75
Content-Type: text/plain; charset=utf-8
Date: Sun, 22 Mar 2026 16:59:16 GMT
X-Cached-Time: 2026-03-22T16:59:16Z
X-Request-Time: 2026-03-22T16:59:16Z
X-Response-Time: 2026-03-22T16:59:16Z

function FindProxyForURL(url, host) { return 'PROXY proxy.test:1; DIRECT' }
9 changes: 9 additions & 0 deletions cache/c53487273bc3f145588b962e7137323c188c10ce8552472300666e14047b6915
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
HTTP/1.1 200 OK
Content-Length: 67
Content-Type: text/plain; charset=utf-8
Date: Sun, 22 Mar 2026 16:54:15 GMT
X-Cached-Time: 2026-03-22T16:54:15Z
X-Request-Time: 2026-03-22T16:54:15Z
X-Response-Time: 2026-03-22T16:54:15Z

function FindProxyForURL(url, host) { return 'PROXY proxy.test:2' }
9 changes: 9 additions & 0 deletions cache/c7f5a30214880547d5c84ff3b9c1377e05747b830186e46eade39294b5dd2a1f
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
HTTP/1.1 200 OK
Content-Length: 69
Content-Type: text/plain; charset=utf-8
Date: Sun, 22 Mar 2026 16:59:16 GMT
X-Cached-Time: 2026-03-22T16:59:16Z
X-Request-Time: 2026-03-22T16:59:16Z
X-Response-Time: 2026-03-22T16:59:16Z

function FindProxyForURL(url, host) { return 'INVALID RETURN VALUE' }
9 changes: 9 additions & 0 deletions cache/ce85a99acdabf1b68e4473376b41aa4dc50147328a0e319bafd1e248ef973afa
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
HTTP/1.1 200 OK
Content-Length: 67
Content-Type: text/plain; charset=utf-8
Date: Sun, 22 Mar 2026 16:59:16 GMT
X-Cached-Time: 2026-03-22T16:59:16Z
X-Request-Time: 2026-03-22T16:59:16Z
X-Response-Time: 2026-03-22T16:59:16Z

function FindProxyForURL(url, host) { return 'PROXY proxy.test:2' }
9 changes: 9 additions & 0 deletions cache/d8fd1758481fb09deb7d1bffb141b12f8650d40fec098903d29ecb7ca088acb6
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
HTTP/1.1 200 OK
Content-Length: 53
Content-Type: text/plain; charset=utf-8
Date: Sun, 22 Mar 2026 16:59:16 GMT
X-Cached-Time: 2026-03-22T16:59:16Z
X-Request-Time: 2026-03-22T16:59:16Z
X-Response-Time: 2026-03-22T16:59:16Z

function FindProxyForURL(url, host) { throw 'error' }
9 changes: 9 additions & 0 deletions cache/db67ad418550730ec11bc2ce2448d28c14e76d67bf88177f6f617ab0e71e24ef
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
HTTP/1.1 200 OK
Content-Length: 13
Content-Type: text/plain; charset=utf-8
Date: Sun, 22 Mar 2026 16:54:14 GMT
X-Cached-Time: 2026-03-22T16:54:14Z
X-Request-Time: 2026-03-22T16:54:14Z
X-Response-Time: 2026-03-22T16:54:14Z

test script 2
9 changes: 9 additions & 0 deletions cache/eace0c216ad07ebd003cf3c5d6da8eb2c0f0da23e1b4b915591c4554c4e3cf01
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
HTTP/1.1 200 OK
Content-Length: 75
Content-Type: text/plain; charset=utf-8
Date: Sun, 22 Mar 2026 16:54:14 GMT
X-Cached-Time: 2026-03-22T16:54:14Z
X-Request-Time: 2026-03-22T16:54:14Z
X-Response-Time: 2026-03-22T16:54:14Z

function FindProxyForURL(url, host) { return 'PROXY proxy.test:1; DIRECT' }
9 changes: 9 additions & 0 deletions cache/ef486688f3c4495bedcf23129c5efa252f6cd96b6de732f94bd885ef3da2fd0f
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
HTTP/1.1 200 OK
Content-Length: 53
Content-Type: text/plain; charset=utf-8
Date: Sun, 22 Mar 2026 16:54:14 GMT
X-Cached-Time: 2026-03-22T16:54:14Z
X-Request-Time: 2026-03-22T16:54:14Z
X-Response-Time: 2026-03-22T16:54:14Z

function FindProxyForURL(url, host) { throw 'error' }
9 changes: 9 additions & 0 deletions cache/efed0a3243f33f5f985c88f83ecf5b581c44cf5a6accd02bcfeb3ea4dcfbd24e
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
HTTP/1.1 200 OK
Content-Length: 65
Content-Type: text/plain; charset=utf-8
Date: Sun, 22 Mar 2026 16:54:15 GMT
X-Cached-Time: 2026-03-22T16:54:15Z
X-Request-Time: 2026-03-22T16:54:15Z
X-Response-Time: 2026-03-22T16:54:15Z

function FindProxyForURL(url, host) { return 'HTTPS https.test' }
17 changes: 9 additions & 8 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,29 @@
module github.com/samuong/alpaca/v2

go 1.22.3

toolchain go1.22.4
go 1.25.3

require (
github.com/gobwas/glob v0.2.3
github.com/keybase/go-keychain v0.0.0-20231219164618-57a3676c3af6
github.com/robertkrimen/otto v0.4.0
github.com/samuong/go-ntlmssp v0.0.0-20240616070040-65a20607c744
github.com/stretchr/testify v1.9.0
github.com/sandrolain/httpcache v1.4.0
github.com/stretchr/testify v1.11.1
github.com/zalando/go-keyring v0.2.5
golang.org/x/term v0.21.0
golang.org/x/term v0.36.0
)

require (
github.com/alessio/shellescape v1.4.1 // indirect
github.com/danieljoos/wincred v1.2.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/godbus/dbus/v5 v5.1.0 // indirect
github.com/google/btree v1.1.3 // indirect
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
golang.org/x/crypto v0.24.0 // indirect
golang.org/x/sys v0.21.0 // indirect
golang.org/x/text v0.16.0 // indirect
golang.org/x/crypto v0.43.0 // indirect
golang.org/x/sys v0.37.0 // indirect
golang.org/x/text v0.30.0 // indirect
gopkg.in/sourcemap.v1 v1.0.5 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading