Skip to content

fix url encode in return to #2

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

Open
anotherGoogleFan wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix url encode in return to #2

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28a7798
some fixes
Dec 6, 2019
d7d24ec
some fixes
Dec 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 29 additions & 19 deletions auth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,14 @@ func NewOpenId(r *http.Request) *OpenId {
id.root = proto + r.Host

uri := r.RequestURI
if i := strings.Index(uri, "openid"); i != -1 {
if i := strings.Index(uri, "openid."); i != -1 {
uri = uri[0 : i-1]
}
id.returnUrl = id.root + uri

switch r.Method {
case "POST":
r.ParseForm()
id.data = r.Form
case "GET":
id.data = r.URL.Query()
Expand All @@ -52,24 +53,15 @@ func NewOpenId(r *http.Request) *OpenId {
}

func (id OpenId) AuthUrl() string {
data := map[string]string{
"openid.claimed_id": openId_identifier,
"openid.identity": openId_identifier,
"openid.mode": openId_mode,
"openid.ns": openId_ns,
"openid.realm": id.root,
"openid.return_to": id.returnUrl,
}

i := 0
url := steam_login + "?"
for key, value := range data {
url += key + "=" + value
if i != len(data)-1 {
url += "&"
}
i++
}
data := make(url.Values)
data.Set("openid.claimed_id", openId_identifier)
data.Set("openid.identity", openId_identifier)
data.Set("openid.mode", openId_mode)
data.Set("openid.ns", openId_ns)
data.Set("openid.realm", id.root)
data.Set("openid.return_to", id.returnUrl)

url := steam_login + "?" + data.Encode()
return url
}

Expand Down Expand Up @@ -120,6 +112,24 @@ func (id *OpenId) ValidateAndGetId() (string, error) {
return digits_extraction_regexp.ReplaceAllString(openIdUrl, ""), nil
}

// Dangerous. Only use for debug.
func (id *OpenId) GetIdWithoutValidateToSteam() (string, error) {
if id.Mode() != "id_res" {
return "", errors.New("Mode must equal to \"id_res\".")
}

if id.data.Get("openid.return_to") != id.returnUrl {
return "", errors.New("The \"return_to url\" must match the url of current request.")
}

openIdUrl := id.data.Get("openid.claimed_id")
if !validation_regexp.MatchString(openIdUrl) {
return "", errors.New("Invalid steam id pattern.")
}

return digits_extraction_regexp.ReplaceAllString(openIdUrl, ""), nil
}

func (id OpenId) ValidateAndGetUser(apiKey string) (*PlayerSummaries, error) {
steamId, err := id.ValidateAndGetId()
if err != nil {
Expand Down