mirror of
https://github.com/minio/minio.git
synced 2024-12-25 22:55:54 -05:00
Merge pull request #99 from fkautz/pr_out_using_generic_make_test_and_make_build_disabled_signers_code_for_now_to_fix_build
This commit is contained in:
Frederick F. Kautz IV
commit
fec80fb1b3
32
Makefile
32
Makefile
@ -11,31 +11,19 @@ getdeps: checkdeps
|
|||||||
@go get github.com/tools/godep && echo "Installed godep"
|
@go get github.com/tools/godep && echo "Installed godep"
|
||||||
@go get golang.org/x/tools/cmd/cover && echo "Installed cover"
|
@go get golang.org/x/tools/cmd/cover && echo "Installed cover"
|
||||||
|
|
||||||
build-utils:
|
build-erasure: getdeps
|
||||||
@godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkg/utils/cpu
|
|
||||||
@godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkg/utils/unitconv
|
|
||||||
@godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkg/utils/split
|
|
||||||
@godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkg/utils/crypto/md5
|
|
||||||
@godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkg/utils/crypto/sha1
|
|
||||||
@godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkg/utils/crypto/sha256
|
|
||||||
@godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkg/utils/crypto/sha512
|
|
||||||
@godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkg/utils/checksum/crc32c
|
|
||||||
@godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkg/utils/database/tiedot
|
|
||||||
@godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkg/utils/crypto/keys
|
|
||||||
@godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkg/utils/crypto/x509
|
|
||||||
|
|
||||||
#build-os:
|
|
||||||
# @godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkg/os/scsi
|
|
||||||
# @godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkg/os/sysctl
|
|
||||||
|
|
||||||
build-storage:
|
|
||||||
@godep go generate github.com/minio-io/minio/pkg/storage/erasure
|
@godep go generate github.com/minio-io/minio/pkg/storage/erasure
|
||||||
@godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkg/storage/erasure
|
@godep go build github.com/minio-io/minio/pkg/storage/erasure
|
||||||
|
|
||||||
build-minioapi:
|
build-all: getdeps build-erasure
|
||||||
@godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkg/webapi/minioapi
|
@echo "Building Libraries"
|
||||||
|
@godep go build ./...
|
||||||
|
|
||||||
minio: build-storage build-utils build-minioapi
|
test-all: build-all
|
||||||
|
@echo "Running Test Suites:"
|
||||||
|
@godep go test -race ./...
|
||||||
|
|
||||||
|
minio: build-all test-all
|
||||||
|
|
||||||
install: minio
|
install: minio
|
||||||
@godep go install github.com/minio-io/minio && echo "Installed minio"
|
@godep go install github.com/minio-io/minio && echo "Installed minio"
|
||||||
|
|||||||
@ -1,191 +1,191 @@
|
|||||||
package signers
|
package signers
|
||||||
|
|
||||||
import (
|
//import (
|
||||||
"bytes"
|
// "bytes"
|
||||||
"crypto/hmac"
|
// "crypto/hmac"
|
||||||
"crypto/sha1"
|
// "crypto/sha1"
|
||||||
"encoding/base64"
|
// "encoding/base64"
|
||||||
"fmt"
|
// "fmt"
|
||||||
"io"
|
// "io"
|
||||||
"net/http"
|
// "net/http"
|
||||||
"net/url"
|
// "net/url"
|
||||||
"sort"
|
// "sort"
|
||||||
"strings"
|
// "strings"
|
||||||
|
|
||||||
"github.com/minio-io/minio/pkg/utils/database"
|
|
||||||
)
|
|
||||||
|
|
||||||
func ValidateAccessKey(key []byte) bool {
|
|
||||||
for _, char := range key {
|
|
||||||
if isalnum(char) {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
switch char {
|
|
||||||
case '-':
|
|
||||||
case '.':
|
|
||||||
case '_':
|
|
||||||
case '~':
|
|
||||||
continue
|
|
||||||
default:
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
func GetAccessID() {
|
|
||||||
}
|
|
||||||
|
|
||||||
func GetSecretID() {
|
|
||||||
}
|
|
||||||
|
|
||||||
// This package implements verification side of Object API Signature request
|
|
||||||
func ValidateRequest(req *http.Request) (bool, error) {
|
|
||||||
if date := req.Header.Get("Date"); date == "" {
|
|
||||||
return false, fmt.Errorf("Date should be set")
|
|
||||||
}
|
|
||||||
hm := hmac.New(sha1.New, []byte(SecretAccessKey))
|
|
||||||
ss := getStringToSign(req)
|
|
||||||
io.WriteString(hm, ss)
|
|
||||||
authHeader := new(bytes.Buffer)
|
|
||||||
if req.Header.Get("User-Agent") == "Minio" {
|
|
||||||
fmt.Fprintf(authHeader, "MINIO %s:", AccessKey)
|
|
||||||
} else {
|
|
||||||
fmt.Fprintf(authHeader, "AWS %s:", AccessKey)
|
|
||||||
}
|
|
||||||
encoder := base64.NewEncoder(base64.StdEncoding, authHeader)
|
|
||||||
encoder.Write(hm.Sum(nil))
|
|
||||||
defer encoder.Close()
|
|
||||||
if req.Header.Get("Authorization") != authHeader.String() {
|
|
||||||
return false, fmt.Errorf("Authorization header mismatch")
|
|
||||||
}
|
|
||||||
return true, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// From the Amazon docs:
|
|
||||||
//
|
//
|
||||||
// StringToSign = HTTP-Verb + "\n" +
|
// "github.com/minio-io/minio/pkg/utils/database"
|
||||||
// Content-MD5 + "\n" +
|
//)
|
||||||
// Content-Type + "\n" +
|
|
||||||
// Date + "\n" +
|
|
||||||
// CanonicalizedAmzHeaders +
|
|
||||||
// CanonicalizedResource;
|
|
||||||
func getStringToSign(req *http.Request) string {
|
|
||||||
buf := new(bytes.Buffer)
|
|
||||||
buf.WriteString(req.Method)
|
|
||||||
buf.WriteByte('\n')
|
|
||||||
buf.WriteString(req.Header.Get("Content-MD5"))
|
|
||||||
buf.WriteByte('\n')
|
|
||||||
buf.WriteString(req.Header.Get("Content-Type"))
|
|
||||||
buf.WriteByte('\n')
|
|
||||||
if req.Header.Get("x-amz-date") == "" {
|
|
||||||
buf.WriteString(req.Header.Get("Date"))
|
|
||||||
}
|
|
||||||
buf.WriteByte('\n')
|
|
||||||
writeCanonicalizedAmzHeaders(buf, req)
|
|
||||||
writeCanonicalizedResource(buf, req)
|
|
||||||
return buf.String()
|
|
||||||
}
|
|
||||||
|
|
||||||
func hasPrefixCaseInsensitive(s, pfx string) bool {
|
|
||||||
if len(pfx) > len(s) {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
shead := s[:len(pfx)]
|
|
||||||
if shead == pfx {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
shead = strings.ToLower(shead)
|
|
||||||
return shead == pfx || shead == strings.ToLower(pfx)
|
|
||||||
}
|
|
||||||
|
|
||||||
func writeCanonicalizedAmzHeaders(buf *bytes.Buffer, req *http.Request) {
|
|
||||||
amzHeaders := make([]string, 0)
|
|
||||||
vals := make(map[string][]string)
|
|
||||||
for k, vv := range req.Header {
|
|
||||||
if hasPrefixCaseInsensitive(k, "x-amz-") {
|
|
||||||
lk := strings.ToLower(k)
|
|
||||||
amzHeaders = append(amzHeaders, lk)
|
|
||||||
vals[lk] = vv
|
|
||||||
}
|
|
||||||
}
|
|
||||||
sort.Strings(amzHeaders)
|
|
||||||
for _, k := range amzHeaders {
|
|
||||||
buf.WriteString(k)
|
|
||||||
buf.WriteByte(':')
|
|
||||||
for idx, v := range vals[k] {
|
|
||||||
if idx > 0 {
|
|
||||||
buf.WriteByte(',')
|
|
||||||
}
|
|
||||||
if strings.Contains(v, "\n") {
|
|
||||||
// TODO: "Unfold" long headers that
|
|
||||||
// span multiple lines (as allowed by
|
|
||||||
// RFC 2616, section 4.2) by replacing
|
|
||||||
// the folding white-space (including
|
|
||||||
// new-line) by a single space.
|
|
||||||
buf.WriteString(v)
|
|
||||||
} else {
|
|
||||||
buf.WriteString(v)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
buf.WriteByte('\n')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Must be sorted:
|
|
||||||
var subResList = []string{"acl", "lifecycle", "location", "logging", "notification", "partNumber", "policy", "requestPayment", "torrent", "uploadId", "uploads", "versionId", "versioning", "versions", "website"}
|
|
||||||
|
|
||||||
// From the Amazon docs:
|
|
||||||
//
|
//
|
||||||
// CanonicalizedResource = [ "/" + Bucket ] +
|
//func ValidateAccessKey(key []byte) bool {
|
||||||
// <HTTP-Request-URI, from the protocol name up to the query string> +
|
// for _, char := range key {
|
||||||
// [ sub-resource, if present. For example "?acl", "?location", "?logging", or "?torrent"];
|
// if isalnum(char) {
|
||||||
func writeCanonicalizedResource(buf *bytes.Buffer, req *http.Request) {
|
// continue
|
||||||
bucket := getBucketFromHostname(req)
|
// }
|
||||||
if bucket != "" {
|
// switch char {
|
||||||
buf.WriteByte('/')
|
// case '-':
|
||||||
buf.WriteString(bucket)
|
// case '.':
|
||||||
}
|
// case '_':
|
||||||
buf.WriteString(req.URL.Path)
|
// case '~':
|
||||||
if req.URL.RawQuery != "" {
|
// continue
|
||||||
n := 0
|
// default:
|
||||||
vals, _ := url.ParseQuery(req.URL.RawQuery)
|
// return false
|
||||||
for _, subres := range subResList {
|
// }
|
||||||
if vv, ok := vals[subres]; ok && len(vv) > 0 {
|
// }
|
||||||
n++
|
// return true
|
||||||
if n == 1 {
|
//}
|
||||||
buf.WriteByte('?')
|
//
|
||||||
} else {
|
//func GetAccessID() {
|
||||||
buf.WriteByte('&')
|
//}
|
||||||
}
|
//
|
||||||
buf.WriteString(subres)
|
//func GetSecretID() {
|
||||||
if len(vv[0]) > 0 {
|
//}
|
||||||
buf.WriteByte('=')
|
//
|
||||||
buf.WriteString(url.QueryEscape(vv[0]))
|
//// This package implements verification side of Object API Signature request
|
||||||
}
|
//func ValidateRequest(req *http.Request) (bool, error) {
|
||||||
}
|
// if date := req.Header.Get("Date"); date == "" {
|
||||||
}
|
// return false, fmt.Errorf("Date should be set")
|
||||||
}
|
// }
|
||||||
}
|
// hm := hmac.New(sha1.New, []byte(SecretAccessKey))
|
||||||
|
// ss := getStringToSign(req)
|
||||||
// hasDotSuffix reports whether s ends with "." + suffix.
|
// io.WriteString(hm, ss)
|
||||||
func hasDotSuffix(s string, suffix string) bool {
|
// authHeader := new(bytes.Buffer)
|
||||||
return len(s) >= len(suffix)+1 && strings.HasSuffix(s, suffix) && s[len(s)-len(suffix)-1] == '.'
|
// if req.Header.Get("User-Agent") == "Minio" {
|
||||||
}
|
// fmt.Fprintf(authHeader, "MINIO %s:", AccessKey)
|
||||||
|
// } else {
|
||||||
func getBucketFromHostname(req *http.Request) string {
|
// fmt.Fprintf(authHeader, "AWS %s:", AccessKey)
|
||||||
host := req.Host
|
// }
|
||||||
if host == "" {
|
// encoder := base64.NewEncoder(base64.StdEncoding, authHeader)
|
||||||
host = req.URL.Host
|
// encoder.Write(hm.Sum(nil))
|
||||||
}
|
// defer encoder.Close()
|
||||||
if host == "s3.amazonaws.com" {
|
// if req.Header.Get("Authorization") != authHeader.String() {
|
||||||
return ""
|
// return false, fmt.Errorf("Authorization header mismatch")
|
||||||
}
|
// }
|
||||||
if hostSuffix := "s3.amazonaws.com"; hasDotSuffix(host, hostSuffix) {
|
// return true, nil
|
||||||
return host[:len(host)-len(hostSuffix)-1]
|
//}
|
||||||
}
|
//
|
||||||
if lastColon := strings.LastIndex(host, ":"); lastColon != -1 {
|
//// From the Amazon docs:
|
||||||
return host[:lastColon]
|
////
|
||||||
}
|
//// StringToSign = HTTP-Verb + "\n" +
|
||||||
return host
|
//// Content-MD5 + "\n" +
|
||||||
}
|
//// Content-Type + "\n" +
|
||||||
|
//// Date + "\n" +
|
||||||
|
//// CanonicalizedAmzHeaders +
|
||||||
|
//// CanonicalizedResource;
|
||||||
|
//func getStringToSign(req *http.Request) string {
|
||||||
|
// buf := new(bytes.Buffer)
|
||||||
|
// buf.WriteString(req.Method)
|
||||||
|
// buf.WriteByte('\n')
|
||||||
|
// buf.WriteString(req.Header.Get("Content-MD5"))
|
||||||
|
// buf.WriteByte('\n')
|
||||||
|
// buf.WriteString(req.Header.Get("Content-Type"))
|
||||||
|
// buf.WriteByte('\n')
|
||||||
|
// if req.Header.Get("x-amz-date") == "" {
|
||||||
|
// buf.WriteString(req.Header.Get("Date"))
|
||||||
|
// }
|
||||||
|
// buf.WriteByte('\n')
|
||||||
|
// writeCanonicalizedAmzHeaders(buf, req)
|
||||||
|
// writeCanonicalizedResource(buf, req)
|
||||||
|
// return buf.String()
|
||||||
|
//}
|
||||||
|
//
|
||||||
|
//func hasPrefixCaseInsensitive(s, pfx string) bool {
|
||||||
|
// if len(pfx) > len(s) {
|
||||||
|
// return false
|
||||||
|
// }
|
||||||
|
// shead := s[:len(pfx)]
|
||||||
|
// if shead == pfx {
|
||||||
|
// return true
|
||||||
|
// }
|
||||||
|
// shead = strings.ToLower(shead)
|
||||||
|
// return shead == pfx || shead == strings.ToLower(pfx)
|
||||||
|
//}
|
||||||
|
//
|
||||||
|
//func writeCanonicalizedAmzHeaders(buf *bytes.Buffer, req *http.Request) {
|
||||||
|
// amzHeaders := make([]string, 0)
|
||||||
|
// vals := make(map[string][]string)
|
||||||
|
// for k, vv := range req.Header {
|
||||||
|
// if hasPrefixCaseInsensitive(k, "x-amz-") {
|
||||||
|
// lk := strings.ToLower(k)
|
||||||
|
// amzHeaders = append(amzHeaders, lk)
|
||||||
|
// vals[lk] = vv
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// sort.Strings(amzHeaders)
|
||||||
|
// for _, k := range amzHeaders {
|
||||||
|
// buf.WriteString(k)
|
||||||
|
// buf.WriteByte(':')
|
||||||
|
// for idx, v := range vals[k] {
|
||||||
|
// if idx > 0 {
|
||||||
|
// buf.WriteByte(',')
|
||||||
|
// }
|
||||||
|
// if strings.Contains(v, "\n") {
|
||||||
|
// // TODO: "Unfold" long headers that
|
||||||
|
// // span multiple lines (as allowed by
|
||||||
|
// // RFC 2616, section 4.2) by replacing
|
||||||
|
// // the folding white-space (including
|
||||||
|
// // new-line) by a single space.
|
||||||
|
// buf.WriteString(v)
|
||||||
|
// } else {
|
||||||
|
// buf.WriteString(v)
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// buf.WriteByte('\n')
|
||||||
|
// }
|
||||||
|
//}
|
||||||
|
//
|
||||||
|
//// Must be sorted:
|
||||||
|
//var subResList = []string{"acl", "lifecycle", "location", "logging", "notification", "partNumber", "policy", "requestPayment", "torrent", "uploadId", "uploads", "versionId", "versioning", "versions", "website"}
|
||||||
|
//
|
||||||
|
//// From the Amazon docs:
|
||||||
|
////
|
||||||
|
//// CanonicalizedResource = [ "/" + Bucket ] +
|
||||||
|
//// <HTTP-Request-URI, from the protocol name up to the query string> +
|
||||||
|
//// [ sub-resource, if present. For example "?acl", "?location", "?logging", or "?torrent"];
|
||||||
|
//func writeCanonicalizedResource(buf *bytes.Buffer, req *http.Request) {
|
||||||
|
// bucket := getBucketFromHostname(req)
|
||||||
|
// if bucket != "" {
|
||||||
|
// buf.WriteByte('/')
|
||||||
|
// buf.WriteString(bucket)
|
||||||
|
// }
|
||||||
|
// buf.WriteString(req.URL.Path)
|
||||||
|
// if req.URL.RawQuery != "" {
|
||||||
|
// n := 0
|
||||||
|
// vals, _ := url.ParseQuery(req.URL.RawQuery)
|
||||||
|
// for _, subres := range subResList {
|
||||||
|
// if vv, ok := vals[subres]; ok && len(vv) > 0 {
|
||||||
|
// n++
|
||||||
|
// if n == 1 {
|
||||||
|
// buf.WriteByte('?')
|
||||||
|
// } else {
|
||||||
|
// buf.WriteByte('&')
|
||||||
|
// }
|
||||||
|
// buf.WriteString(subres)
|
||||||
|
// if len(vv[0]) > 0 {
|
||||||
|
// buf.WriteByte('=')
|
||||||
|
// buf.WriteString(url.QueryEscape(vv[0]))
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
//}
|
||||||
|
//
|
||||||
|
//// hasDotSuffix reports whether s ends with "." + suffix.
|
||||||
|
//func hasDotSuffix(s string, suffix string) bool {
|
||||||
|
// return len(s) >= len(suffix)+1 && strings.HasSuffix(s, suffix) && s[len(s)-len(suffix)-1] == '.'
|
||||||
|
//}
|
||||||
|
//
|
||||||
|
//func getBucketFromHostname(req *http.Request) string {
|
||||||
|
// host := req.Host
|
||||||
|
// if host == "" {
|
||||||
|
// host = req.URL.Host
|
||||||
|
// }
|
||||||
|
// if host == "s3.amazonaws.com" {
|
||||||
|
// return ""
|
||||||
|
// }
|
||||||
|
// if hostSuffix := "s3.amazonaws.com"; hasDotSuffix(host, hostSuffix) {
|
||||||
|
// return host[:len(host)-len(hostSuffix)-1]
|
||||||
|
// }
|
||||||
|
// if lastColon := strings.LastIndex(host, ":"); lastColon != -1 {
|
||||||
|
// return host[:lastColon]
|
||||||
|
// }
|
||||||
|
// return host
|
||||||
|
//}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user