repo-mirrors/traefik-github-oauth-plugin
1
0
Fork 0
mirror of https://github.com/MuXiu1997/traefik-github-oauth-plugin synced 2025-12-17 18:31:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(middleware): message when api secret key is invalid

Browse Source
This commit is contained in:
MuXiu1997
2023-01-26 13:08:27 +08:00
parent 6ba37f6fe0
commit 61383468b2
1 changed files with 47 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
middleware_plugin.go
View File

@@ -148,27 +148,30 @@ func (p *TraefikGithubOauthPlugin) redirectToOAuthPage(rw http.ResponseWriter, r
}
func (p *TraefikGithubOauthPlugin) generateOAuthPageURL(originalReq *http.Request) (string, error) {
requestURL, err := url.Parse(p.apiBaseUrl)
if err != nil {
return "", err
var request *http.Request
{
requestURL, err := url.Parse(p.apiBaseUrl)
if err != nil {
return "", err
}
requestURL = requestURL.JoinPath(constant.ROUTER_GROUP_PATH_OAUTH, constant.ROUTER_PATH_OAUTH_PAGE_URL)
request, err := http.NewRequest(http.MethodPost, requestURL.String(), nil)
if err != nil {
return "", err
}
request.Header.Add("Content-Type", "application/json")
if 0 < len(p.apiSecretKey) {
request.Header.Add(constant.HTTP_HEADER_AUTHORIZATION, fmt.Sprintf("%s %s", constant.AUTHORIZATION_PREFIX_TOKEN, p.apiSecretKey))
}
requestBody, err := json.Marshal(model.RequestGenerateOAuthPageURL{
RedirectURI: getRawRequestUrl(originalReq),
AuthURL: p.getAuthURL(originalReq),
})
if err != nil {
return "", err
}
request.Body = io.NopCloser(bytes.NewReader(requestBody))
}
requestURL = requestURL.JoinPath(constant.ROUTER_GROUP_PATH_OAUTH, constant.ROUTER_PATH_OAUTH_PAGE_URL)
request, err := http.NewRequest(http.MethodPost, requestURL.String(), nil)
if err != nil {
return "", err
}
request.Header.Add("Content-Type", "application/json")
if 0 < len(p.apiSecretKey) {
request.Header.Add(constant.HTTP_HEADER_AUTHORIZATION, fmt.Sprintf("%s %s", constant.AUTHORIZATION_PREFIX_TOKEN, p.apiSecretKey))
}
requestBody, err := json.Marshal(model.RequestGenerateOAuthPageURL{
RedirectURI: getRawRequestUrl(originalReq),
AuthURL: p.getAuthURL(originalReq),
})
if err != nil {
return "", err
}
request.Body = io.NopCloser(bytes.NewReader(requestBody))
result := &model.ResponseGenerateOAuthPageURL{}
resp, err := http.DefaultClient.Do(request)
@@ -178,6 +181,9 @@ func (p *TraefikGithubOauthPlugin) generateOAuthPageURL(originalReq *http.Reques
defer func(b io.ReadCloser) {
_ = b.Close()
}(resp.Body)
if resp.StatusCode == http.StatusUnauthorized {
return "", fmt.Errorf("invalid api secret key")
}
if resp.StatusCode != http.StatusCreated {
return "", fmt.Errorf("generateOAuthPageURL failed, status code: %d", resp.StatusCode)
}
@@ -188,21 +194,25 @@ func (p *TraefikGithubOauthPlugin) generateOAuthPageURL(originalReq *http.Reques
}
func (p *TraefikGithubOauthPlugin) getAuthResult(rid string) (*model.ResponseGetAuthResult, error) {
requestURL, err := url.Parse(p.apiBaseUrl)
if err != nil {
return nil, err
}
requestURL = requestURL.JoinPath(constant.ROUTER_GROUP_PATH_OAUTH, constant.ROUTER_PATH_OAUTH_RESULT)
requestURLQuery := requestURL.Query()
requestURLQuery.Set(constant.QUERY_KEY_REQUEST_ID, rid)
requestURL.RawQuery = requestURLQuery.Encode()
request, err := http.NewRequest(http.MethodGet, requestURL.String(), nil)
if err != nil {
return nil, err
}
if 0 < len(p.apiSecretKey) {
request.Header.Add(constant.HTTP_HEADER_AUTHORIZATION, fmt.Sprintf("%s %s", constant.AUTHORIZATION_PREFIX_TOKEN, p.apiSecretKey))
var request *http.Request
{
requestURL, err := url.Parse(p.apiBaseUrl)
if err != nil {
return nil, err
}
requestURL = requestURL.JoinPath(constant.ROUTER_GROUP_PATH_OAUTH, constant.ROUTER_PATH_OAUTH_RESULT)
requestURLQuery := requestURL.Query()
requestURLQuery.Set(constant.QUERY_KEY_REQUEST_ID, rid)
requestURL.RawQuery = requestURLQuery.Encode()
request, err := http.NewRequest(http.MethodGet, requestURL.String(), nil)
if err != nil {
return nil, err
}
if 0 < len(p.apiSecretKey) {
request.Header.Add(constant.HTTP_HEADER_AUTHORIZATION, fmt.Sprintf("%s %s", constant.AUTHORIZATION_PREFIX_TOKEN, p.apiSecretKey))
}
}
resp, err := http.DefaultClient.Do(request)
if err != nil {
return nil, err
@@ -210,6 +220,9 @@ func (p *TraefikGithubOauthPlugin) getAuthResult(rid string) (*model.ResponseGet
defer func(b io.ReadCloser) {
_ = b.Close()
}(resp.Body)
if resp.StatusCode == http.StatusUnauthorized {
return nil, fmt.Errorf("invalid api secret key")
}
if resp.StatusCode != http.StatusOK {
return nil, fmt.Errorf("getAuthResult failed, status code: %d", resp.StatusCode)
}