Skip to content

Signed query #11

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
mfine wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Signed query #11

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d11b816
Signed URL path.
mfine Jul 14, 2013
c4377ed
move over to SignQuery.
mfine Jul 14, 2013
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
29 changes: 29 additions & 0 deletions sign.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"net/http"
"sort"
"strings"
"time"
)

var signParams = map[string]bool{
Expand Down Expand Up @@ -71,6 +72,10 @@ func Sign(r *http.Request, k Keys) {
DefaultService.Sign(r, k)
}

func SignQuery(r *http.Request, t time.Time, k Keys) {
DefaultService.SignQuery(r, t, k)
}

// Service represents an S3-compatible service.
type Service struct {
Domain string // service root domain, used to extract subdomain from an http.Request and pass it to Bucket
Expand All @@ -89,6 +94,17 @@ func (s *Service) Sign(r *http.Request, k Keys) {
r.Header.Set("Authorization", "AWS "+k.AccessKey+":"+string(sig))
}

func (s *Service) SignQuery(r *http.Request, t time.Time, k Keys) {
if k.SecurityToken != "" {
r.Header.Set("X-Amz-Security-Token", k.SecurityToken)
}
h := hmac.New(sha1.New, []byte(k.SecretKey))
s.writeSigQueryData(h, r, t)
sig := make([]byte, base64.StdEncoding.EncodedLen(h.Size()))
base64.StdEncoding.Encode(sig, h.Sum(nil))
r.URL.RawQuery = "AWSAccessKeyId="+k.AccessKey+"&Signature="+string(sig)+"&Expires="+string(t.Unix())
}

func (s *Service) writeSigData(w io.Writer, r *http.Request) {
w.Write([]byte(r.Method))
w.Write([]byte{'\n'})
Expand All @@ -104,6 +120,19 @@ func (s *Service) writeSigData(w io.Writer, r *http.Request) {
s.writeResource(w, r)
}

func (s *Service) writeSigQueryData(w io.Writer, r *http.Request, t time.Time) {
w.Write([]byte(r.Method))
w.Write([]byte{'\n'})
w.Write([]byte(r.Header.Get("content-md5")))
w.Write([]byte{'\n'})
w.Write([]byte(r.Header.Get("content-type")))
w.Write([]byte{'\n'})
w.Write([]byte(string(t.Unix())))
w.Write([]byte{'\n'})
writeAmzHeaders(w, r)
s.writeResource(w, r)
}

func (s *Service) writeResource(w io.Writer, r *http.Request) {
s.writeVhostBucket(w, strings.ToLower(r.Host))
path := r.URL.RequestURI()
Expand Down