Add GitLab support #10
Merged
Conversation
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
For now based on non-expiring access token Also adds a settings endpoint to detect if GitHub or GitLab is enabled
biilmann
force-pushed
the
gitlab-support
branch
from
d3043ca to
51e2bb1
Compare
rybit
approved these changes
Jan 16, 2018
| r.URL.Scheme = target.Scheme | ||
| r.URL.Host = target.Host | ||
| r.URL.Path = singleJoiningSlash(target.Path, gitlabPathRegexp.ReplaceAllString(r.URL.Path, "/")) | ||
| if targetQuery == "" || r.URL.RawQuery == "" { |
There was a problem hiding this comment.
this is a little confusing - but totally fine.
if targetQuery == "" {
r.URL.RawQuery = r.URL.RawQuery
} else if r.URL.RawQuery == "" {
r.URL.RawQuery = targetQuery
} else {
r.URL.RawQuery = targetQuery + "&" + r.URL.RawQuery
}
| } else { | ||
| r.URL.RawQuery = targetQuery + "&" + r.URL.RawQuery | ||
| } | ||
| if _, ok := r.Header["User-Agent"]; !ok { |
There was a problem hiding this comment.
you're removing it if it is not set? I'm confused. Also, personally, I'd use the Get and Del methods.
if h := r.Header.Get("User-Agent"); h == "" {
r.Header.Del("User-Agent")
}
api/gitlab.go
Outdated
| } | ||
|
|
||
| log := getLogEntry(r) | ||
| log.Infof("Proxying to GitHub: %v", r.URL.String()) |
api/gitlab.go
Outdated
| apiURL := singleJoiningSlash(endpoint, "/repos/"+config.GitLab.Repo) | ||
| target, err := url.Parse(apiURL) | ||
| if err != nil { | ||
| handleError(internalServerError("Unable to process GitHub endpoint"), w, r) |
api/gitlab.go
Outdated
| } | ||
|
|
||
| if !gitlabAllowedRegexp.MatchString(r.URL.Path) { | ||
| return errors.New("Access to endpoint not allowed: this part of GitHub's API has been restricted") |
| func (t *GitLabTransport) RoundTrip(r *http.Request) (*http.Response, error) { | ||
| resp, err := http.DefaultTransport.RoundTrip(r) | ||
| if err == nil { | ||
| // remove CORS headers from GitHub and use our own |
|
Closes #9 |
|
Is there any work left to be done on this before it can be merged into master? |
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
For now based on non-expiring access token.
Also adds a settings endpoint to detect if GitHub or GitLab is enabled.