feat: add HTTP caching for PAC fetch using httpcache (RFC 9111 compli… #171
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,3 +4,5 @@ | |
| __debug_bin* | ||
| .idea | ||
| .DS_Store | ||
| cache/ | ||
| cache/ | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,28 +1,29 @@ | ||
| module github.com/samuong/alpaca/v2 | ||
|
|
||
| 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/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.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.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 | ||
| ) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| package main | ||
|
|
||
| import ( | ||
| "net/http" | ||
| "net/http/httptest" | ||
| "testing" | ||
| ) | ||
|
|
||
| func TestPACCacheNoFallback(t *testing.T) { | ||
| server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { | ||
| w.Write([]byte("function FindProxyForURL() { return 'DIRECT'; }")) | ||
| })) | ||
|
|
||
| pf := newPACFetcher(server.URL) | ||
|
|
||
| data := pf.download() | ||
| if data == nil { | ||
| t.Fatal("expected PAC data on first fetch") | ||
| } | ||
|
|
||
| server.Close() | ||
|
|
||
| data = pf.download() | ||
| if data != nil { | ||
| t.Fatal("expected nil when server is down (no cache fallback)") | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| // Copyright 2019, 2021, 2022, 2025 The Alpaca Authors | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,7 +14,7 @@ | |
|
|
||
| package main | ||
|
|
||
| type pacFinder struct { | ||
| pacURL string | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -69,18 +69,18 @@ func TestTransportErrors(t *testing.T) { | |
| req, err := http.NewRequest(http.MethodGet, "http://alpaca.test", nil) | ||
| require.NoError(t, err) | ||
|
|
||
| t.Run("NotConnected", func(t *testing.T) { | ||
| _, err = tr.RoundTrip(req) | ||
| assert.Error(t, err) | ||
| }) | ||
|
|
||
| t.Run("Closed", func(t *testing.T) { | ||
| require.NoError(t, tr.Close()) | ||
| _, err = tr.RoundTrip(req) | ||
| assert.Error(t, err) | ||
| }) | ||
|
|
||
| t.Run("CloseTwice", func(t *testing.T) { | ||
| assert.NoError(t, tr.Close()) | ||
| assert.NoError(t, tr.Close()) | ||
| }) | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i think we just need this once?