This repository has been archived by the owner on Jan 27, 2025. It is now read-only.
Sync with upstream #10
Merged
Conversation
This file contains 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
* STORY-25143 - Add prometheus metrics to smokescreen * STORY-25143 - Cleanup * STORY-25143 - Fix tests to compare new metric labels * STORY-25143 - Host prometheus endpoint on separate port * STORY-25143 - Use value provided via command line flag * STORY-25143 - Add prometheus timing metrics * STORY-25143 - Fix nil map assignment and prometheus metric name sanitisation * STORY-25143 - Cleanup comments * STORY-25143 - Remove some repetition + add further unit testing * STORY-25143 - Document new prometheus features in README + add port flag to prometheus config * STORY-25143 - Make PR requested changes: * Don't export metrics list * Follow project sytlistic choices * STORY-25143 - Rename only one receiver * STORY-25143 - Add new `--expose-prometheus-metrics` flag to CLI to toggle exposing prometheus metrics * Small cleanup of timer metrics * Fix go module vendoring
fix/test use ElementsMatch to ignore order
…st-handler-after-the-main-check Move the custom request handler call after the main ACL check
* dont return denial errors for dns resolution failures * fix test * move DNSError check into net.Error assertion, extend test * fix integration test
* add AcceptResponseHandler to modify accepted responses * customer->custom
* update docs to clarify global_deny_list behavior * consistent example domain * be more concise
* pipe AcceptResponseHandler into new goproxy hook * update comment * go mod vendor * unit test * use smokescreenctx in acceptresponsehandler * fix unit tests
* export SmokescreenContext type * also export AclDecision * ResolvedAddr too * consistent caps * Update pkg/smokescreen/smokescreen.go Co-authored-by: jjiang-stripe <[email protected]> * export Decision --------- Co-authored-by: jjiang-stripe <[email protected]>
Bumps [golang.org/x/net](https://github.com/golang/net) from 0.7.0 to 0.17.0. - [Commits](golang/net@v0.7.0...v0.17.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…addrs Configurable http and https proxy addrs
* update docs to clarify how IP filtering works
Fix outbound IP logging
* Introduce CONNECT Proxy URL ACL Support Add gitignore debug changes WIP Basic concept working WIP Cleaned up some things prereview fixed tests Removed extraneous yaml file Add correctly failing test tmp WIP WIP WIP WIP WIP WIP * WIP * WIP * PR feedback 1 * Fixed tests * testing again * WIP * Added extra test
Add MITM support to smokescreen
…ndler Add Support for Reject Handler with SmokescreenContext
…tx-changes Make SmokeScreen Context Fields Public
Adding [allow|deny]_addresses settings to yaml config file
fix: fix slice init length
There is some strange interplay between github actions for pushes and prs which is causing them to be run multiple times / cancel each other out, the above is a successful run. We can follow up with changes to the workflow yml if needed but otherwise I think we are good here. |
amber-higgins
added a commit
that referenced
this pull request
Jan 27, 2025
This reverts commit 5ef31cf.
amber-higgins
added a commit
that referenced
this pull request
Jan 27, 2025
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Part of fixing https://github.com/intercom/intercom/issues/377754 (followup action is to bump the git SHA in DVA)