Skip to content
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

Jump to bottom

Add upstream proxy functionality #25

Merged
merged 4 commits into from
Jun 28, 2021
Merged

Add upstream proxy functionality #25

merged 4 commits into from
Jun 28, 2021

Conversation

adobeDan
Copy link
Contributor

Summary

  • Add an upstream proxy specification to the configuration file. This must be an HTTP proxy that supports CONNECT. It can require basic authentication.
  • Make the FRL reverse proxy use the (optionally) specified upstream proxy.

Testing Steps

  • Start up a non-authenticating (or authenticating) proxy (such as CharlesProxy).
  • Configure the FRL reverse proxy to use the upstream proxy.
  • Activate and deactivate products as usual.

Fixes #24

adobeDan added 4 commits June 19, 2021 21:03
@adobeDan
Add CLion project files.
f0f4b1d 
This makes it easier to do cross-platform development.
@adobeDan
Add basic proxy capabilities.
f90f814 
1. Extend the config file to allow specifying an optional upstream proxy host and port (assumes http protocol), and an optional basic authentication username and password.
2. Make the upstream COPS call use any specified proxy.  Credit to the hyper-proxy and hyper authors for how to do this.
3. Add eyre to the proxy service to provide better error messaging.

Works on Mac, going to port to Windows next.
@adobeDan
Add project files for JetBrains.
c699313
@adobeDan
Add windows project files.
80508a7 
Also allow for an ignored local directory.
@adobeDan adobeDan requested a review from adorton-adobe June 25, 2021 06:28
@adorton-adobe
Copy link
Contributor

I'll take a look today.

@adorton-adobe
Copy link
Contributor

I unfortunately didn't get a chance to look too close into this today. I'll do some testing in the first half of next week and let you know if I run into anything.

@adobeDan adobeDan mentioned this pull request Jun 27, 2021
Merged
adorton-adobe
adorton-adobe approved these changes Jun 28, 2021
View reviewed changes
Copy link
Contributor

@adorton-adobe adorton-adobe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure if it's possible to test using Charles with a username and password, but it looks good from the testing I could do.

@adobeDan adobeDan merged commit 674cede into adobe:dev Jun 28, 2021
@adobeDan adobeDan deleted the proxy branch June 28, 2021 20:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@adorton-adobe adorton-adobe adorton-adobe approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

The proxy should work with upstream proxies
2 participants
@adobeDan @adorton-adobe