extern/zrok
1
1
Fork 0
mirror of https://github.com/openziti/zrok.git synced 2025-08-13 17:57:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

docs; tweaks (#404)

Browse Source
This commit is contained in:
Michael Quigley
2023-10-05 13:34:27 -04:00
parent 19d93d2825
commit 72b80bac94
6 changed files with 104 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
endpoints/publicProxy/github.go
View File

@ -5,12 +5,6 @@ import (
"encoding/json"
"errors"
"fmt"
"io"
"net/http"
"net/url"
"strings"
"time"
"github.com/golang-jwt/jwt/v5"
"github.com/google/uuid"
"github.com/sirupsen/logrus"
@ -19,6 +13,11 @@ import (
"github.com/zitadel/oidc/v2/pkg/oidc"
"golang.org/x/oauth2"
githubOAuth "golang.org/x/oauth2/github"
"io"
"net/http"
"net/url"
"strings"
"time"
)
func configureGithubOauth(cfg *OauthConfig, tls bool) error {
@ -44,11 +43,11 @@ func configureGithubOauth(cfg *OauthConfig, tls bool) error {
}
hash := md5.New()
n, err := hash.Write([]byte(cfg.HashKeyRaw))
n, err := hash.Write([]byte(cfg.HashKey))
if err != nil {
return err
}
if n != len(cfg.HashKeyRaw) {
if n != len(cfg.HashKey) {
return errors.New("short hash")
}
key := hash.Sum(nil)
@ -137,14 +136,16 @@ func configureGithubOauth(cfg *OauthConfig, tls bool) error {
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
defer resp.Body.Close()
defer func() {
_ = resp.Body.Close()
}()
response, err := io.ReadAll(resp.Body)
if err != nil {
logrus.Errorf("Error reading response body: %v", err)
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
rDat := []githubUserResp{}
var rDat []githubUserResp
err = json.Unmarshal(response, &rDat)
if err != nil {
logrus.Errorf("Error unmarshalling google oauth response: %v", err)