You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by fr...@apache.org on 2017/04/10 14:18:43 UTC
[1/2] incubator-trafficcontrol git commit: Remove TO client
ResumeSession, remove juju dep
Repository: incubator-trafficcontrol
Updated Branches:
refs/heads/2.0.x 4c3dd48bf -> 9d004e1ee
Remove TO client ResumeSession, remove juju dep
Removes traffic_ops/client.ResumeSession().
This allows us to remove the juju persistent cookie dependency, which
has an incompatible license.
Traffic Control itself doesn't use it, and any users would need logic
to handle expired cookies and do an ordinary Login anyway, which is
not an expensive operation.
TC-119 #close
(cherry picked from commit 837c6f929856cb368c4231165e43a3968a260ff4)
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/ad28f33f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/ad28f33f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/ad28f33f
Branch: refs/heads/2.0.x
Commit: ad28f33fea62cc5ce2c5a7a667b8cf9f06b7b7a2
Parents: 4c3dd48
Author: Robert Butts <ro...@gmail.com>
Authored: Tue Apr 4 22:28:15 2017 -0600
Committer: Eric Friedrich <ef...@cisco.com>
Committed: Mon Apr 10 10:15:29 2017 -0400
----------------------------------------------------------------------
traffic_ops/client/traffic_ops.go | 35 +-
.../juju/persistent-cookiejar/LICENSE | 27 -
.../juju/persistent-cookiejar/README.md | 120 ----
.../juju/persistent-cookiejar/dependencies.tsv | 4 -
.../github.com/juju/persistent-cookiejar/jar.go | 680 -------------------
.../juju/persistent-cookiejar/punycode.go | 159 -----
.../juju/persistent-cookiejar/serialize.go | 152 -----
7 files changed, 1 insertion(+), 1176 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/ad28f33f/traffic_ops/client/traffic_ops.go
----------------------------------------------------------------------
diff --git a/traffic_ops/client/traffic_ops.go b/traffic_ops/client/traffic_ops.go
index 2450808..cd83c9b 100644
--- a/traffic_ops/client/traffic_ops.go
+++ b/traffic_ops/client/traffic_ops.go
@@ -22,11 +22,11 @@ import (
"fmt"
"io/ioutil"
"net/http"
+ "net/http/cookiejar"
"strings"
"sync"
"time"
- "github.com/juju/persistent-cookiejar"
"golang.org/x/net/publicsuffix"
)
@@ -110,37 +110,6 @@ func loginCreds(toUser string, toPasswd string) ([]byte, error) {
return js, nil
}
-func ResumeSession(toURL string, insecure bool) (*Session, error) {
- options := cookiejar.Options{
- PublicSuffixList: publicsuffix.List,
- }
-
- jar, err := cookiejar.New(&options)
-
- if err != nil {
- return nil, err
- }
-
- to := NewSession("", "", toURL, "", &http.Client{
- Timeout: DefaultTimeout,
- Transport: &http.Transport{
- TLSClientConfig: &tls.Config{InsecureSkipVerify: insecure},
- },
- Jar: jar,
- }, false)
-
- resp, err := to.request("GET", "/api/1.2/user/current.json", nil)
-
- if err != nil {
- return nil, err
- }
-
- jar.Save()
- fmt.Printf("Traffic Ops Session Resumed (%s)\n", resp.Status)
-
- return to, nil
-}
-
// Deprecated: Login is deprecated, use LoginWithAgent instead. The `Login` function with its present signature will be removed in the next version and replaced with `Login(toURL string, toUser string, toPasswd string, insecure bool, userAgent string)`. The `LoginWithAgent` function will be removed the version after that.
func Login(toURL string, toUser string, toPasswd string, insecure bool) (*Session, error) {
return LoginWithAgent(toURL, toUser, toPasswd, insecure, "traffic-ops-client", false, DefaultTimeout) // TODO add UserAgent version
@@ -198,8 +167,6 @@ func LoginWithAgent(toURL string, toUser string, toPasswd string, insecure bool,
return nil, err
}
- jar.Save()
-
return to, nil
}
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/ad28f33f/traffic_stats/vendor/github.com/juju/persistent-cookiejar/LICENSE
----------------------------------------------------------------------
diff --git a/traffic_stats/vendor/github.com/juju/persistent-cookiejar/LICENSE b/traffic_stats/vendor/github.com/juju/persistent-cookiejar/LICENSE
deleted file mode 100644
index 7448756..0000000
--- a/traffic_stats/vendor/github.com/juju/persistent-cookiejar/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2012 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
- * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
- * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/ad28f33f/traffic_stats/vendor/github.com/juju/persistent-cookiejar/README.md
----------------------------------------------------------------------
diff --git a/traffic_stats/vendor/github.com/juju/persistent-cookiejar/README.md b/traffic_stats/vendor/github.com/juju/persistent-cookiejar/README.md
deleted file mode 100644
index f0c8c56..0000000
--- a/traffic_stats/vendor/github.com/juju/persistent-cookiejar/README.md
+++ /dev/null
@@ -1,120 +0,0 @@
-# cookiejar
---
- import "github.com/juju/persistent-cookiejar"
-
-Package cookiejar implements an in-memory RFC 6265-compliant http.CookieJar.
-
-This implementation is a fork of net/http/cookiejar which also implements
-methods for dumping the cookies to persistent storage and retrieving them.
-
-## Usage
-
-#### func DefaultCookieFile
-
-```go
-func DefaultCookieFile() string
-```
-DefaultCookieFile returns the default cookie file to use for persisting cookie
-data. The following names will be used in decending order of preference:
-
- - the value of the $GOCOOKIES environment variable.
- - $HOME/.go-cookies
-
-#### type Jar
-
-```go
-type Jar struct {
-}
-```
-
-Jar implements the http.CookieJar interface from the net/http package.
-
-#### func New
-
-```go
-func New(o *Options) (*Jar, error)
-```
-New returns a new cookie jar. A nil *Options is equivalent to a zero Options.
-
-New will return an error if the cookies could not be loaded from the file for
-any reason than if the file does not exist.
-
-#### func (*Jar) Cookies
-
-```go
-func (j *Jar) Cookies(u *url.URL) (cookies []*http.Cookie)
-```
-Cookies implements the Cookies method of the http.CookieJar interface.
-
-It returns an empty slice if the URL's scheme is not HTTP or HTTPS.
-
-#### func (*Jar) Save
-
-```go
-func (j *Jar) Save() error
-```
-Save saves the cookies to the persistent cookie file. Before the file is
-written, it reads any cookies that have been stored from it and merges them into
-j.
-
-#### func (*Jar) SetCookies
-
-```go
-func (j *Jar) SetCookies(u *url.URL, cookies []*http.Cookie)
-```
-SetCookies implements the SetCookies method of the http.CookieJar interface.
-
-It does nothing if the URL's scheme is not HTTP or HTTPS.
-
-#### type Options
-
-```go
-type Options struct {
- // PublicSuffixList is the public suffix list that determines whether
- // an HTTP server can set a cookie for a domain.
- //
- // If this is nil, the public suffix list implementation in golang.org/x/net/publicsuffix
- // is used.
- PublicSuffixList PublicSuffixList
-
- // Filename holds the file to use for storage of the cookies.
- // If it is empty, the value of DefaultCookieFile will be used.
- Filename string
-}
-```
-
-Options are the options for creating a new Jar.
-
-#### type PublicSuffixList
-
-```go
-type PublicSuffixList interface {
- // PublicSuffix returns the public suffix of domain.
- //
- // TODO: specify which of the caller and callee is responsible for IP
- // addresses, for leading and trailing dots, for case sensitivity, and
- // for IDN/Punycode.
- PublicSuffix(domain string) string
-
- // String returns a description of the source of this public suffix
- // list. The description will typically contain something like a time
- // stamp or version number.
- String() string
-}
-```
-
-PublicSuffixList provides the public suffix of a domain. For example:
-
- - the public suffix of "example.com" is "com",
- - the public suffix of "foo1.foo2.foo3.co.uk" is "co.uk", and
- - the public suffix of "bar.pvt.k12.ma.us" is "pvt.k12.ma.us".
-
-Implementations of PublicSuffixList must be safe for concurrent use by multiple
-goroutines.
-
-An implementation that always returns "" is valid and may be useful for testing
-but it is not secure: it means that the HTTP server for foo.com can set a cookie
-for bar.com.
-
-A public suffix list implementation is in the package
-golang.org/x/net/publicsuffix.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/ad28f33f/traffic_stats/vendor/github.com/juju/persistent-cookiejar/dependencies.tsv
----------------------------------------------------------------------
diff --git a/traffic_stats/vendor/github.com/juju/persistent-cookiejar/dependencies.tsv b/traffic_stats/vendor/github.com/juju/persistent-cookiejar/dependencies.tsv
deleted file mode 100644
index 2f722be..0000000
--- a/traffic_stats/vendor/github.com/juju/persistent-cookiejar/dependencies.tsv
+++ /dev/null
@@ -1,4 +0,0 @@
-github.com/juju/go4 git 40d72ab9641a2a8c36a9c46a51e28367115c8e59 2016-02-22T16:32:58Z
-golang.org/x/net git b6d7b1396ec874c3b00f6c84cd4301a17c56c8ed 2016-02-17T01:13:48Z
-gopkg.in/errgo.v1 git 66cb46252b94c1f3d65646f54ee8043ab38d766c 2015-10-07T15:31:57Z
-gopkg.in/retry.v1 git c09f6b86ba4d5d2cf5bdf0665364aec9fd4815db 2016-10-25T18:14:30Z
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/ad28f33f/traffic_stats/vendor/github.com/juju/persistent-cookiejar/jar.go
----------------------------------------------------------------------
diff --git a/traffic_stats/vendor/github.com/juju/persistent-cookiejar/jar.go b/traffic_stats/vendor/github.com/juju/persistent-cookiejar/jar.go
deleted file mode 100644
index 0a4df82..0000000
--- a/traffic_stats/vendor/github.com/juju/persistent-cookiejar/jar.go
+++ /dev/null
@@ -1,680 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package cookiejar implements an in-memory RFC 6265-compliant http.CookieJar.
-//
-// This implementation is a fork of net/http/cookiejar which also
-// implements methods for dumping the cookies to persistent
-// storage and retrieving them.
-package cookiejar
-
-import (
- "errors"
- "fmt"
- "net"
- "net/http"
- "net/url"
- "os"
- "path/filepath"
- "runtime"
- "sort"
- "strings"
- "sync"
- "time"
-
- "golang.org/x/net/publicsuffix"
- "gopkg.in/errgo.v1"
-)
-
-// PublicSuffixList provides the public suffix of a domain. For example:
-// - the public suffix of "example.com" is "com",
-// - the public suffix of "foo1.foo2.foo3.co.uk" is "co.uk", and
-// - the public suffix of "bar.pvt.k12.ma.us" is "pvt.k12.ma.us".
-//
-// Implementations of PublicSuffixList must be safe for concurrent use by
-// multiple goroutines.
-//
-// An implementation that always returns "" is valid and may be useful for
-// testing but it is not secure: it means that the HTTP server for foo.com can
-// set a cookie for bar.com.
-//
-// A public suffix list implementation is in the package
-// golang.org/x/net/publicsuffix.
-type PublicSuffixList interface {
- // PublicSuffix returns the public suffix of domain.
- //
- // TODO: specify which of the caller and callee is responsible for IP
- // addresses, for leading and trailing dots, for case sensitivity, and
- // for IDN/Punycode.
- PublicSuffix(domain string) string
-
- // String returns a description of the source of this public suffix
- // list. The description will typically contain something like a time
- // stamp or version number.
- String() string
-}
-
-// Options are the options for creating a new Jar.
-type Options struct {
- // PublicSuffixList is the public suffix list that determines whether
- // an HTTP server can set a cookie for a domain.
- //
- // If this is nil, the public suffix list implementation in golang.org/x/net/publicsuffix
- // is used.
- PublicSuffixList PublicSuffixList
-
- // Filename holds the file to use for storage of the cookies.
- // If it is empty, the value of DefaultCookieFile will be used.
- Filename string
-}
-
-// Jar implements the http.CookieJar interface from the net/http package.
-type Jar struct {
- // filename holds the file that the cookies were loaded from.
- filename string
-
- psList PublicSuffixList
-
- // mu locks the remaining fields.
- mu sync.Mutex
-
- // entries is a set of entries, keyed by their eTLD+1 and subkeyed by
- // their name/domain/path.
- entries map[string]map[string]entry
-}
-
-var noOptions Options
-
-// New returns a new cookie jar. A nil *Options is equivalent to a zero
-// Options.
-//
-// New will return an error if the cookies could not be loaded
-// from the file for any reason than if the file does not exist.
-func New(o *Options) (*Jar, error) {
- return newAtTime(o, time.Now())
-}
-
-// newAtTime is like New but takes the current time as a parameter.
-func newAtTime(o *Options, now time.Time) (*Jar, error) {
- jar := &Jar{
- entries: make(map[string]map[string]entry),
- }
- if o == nil {
- o = &noOptions
- }
- if jar.psList = o.PublicSuffixList; jar.psList == nil {
- jar.psList = publicsuffix.List
- }
- if jar.filename = o.Filename; jar.filename == "" {
- jar.filename = DefaultCookieFile()
- }
- if err := jar.load(); err != nil {
- return nil, errgo.Notef(err, "cannot load cookies")
- }
- jar.deleteExpired(now)
- return jar, nil
-}
-
-// homeDir returns the OS-specific home path as specified in the environment.
-func homeDir() string {
- if runtime.GOOS == "windows" {
- return filepath.Join(os.Getenv("HOMEDRIVE"), os.Getenv("HOMEPATH"))
- }
- return os.Getenv("HOME")
-}
-
-// entry is the internal representation of a cookie.
-//
-// This struct type is not used outside of this package per se, but the exported
-// fields are those of RFC 6265.
-// Note that this structure is marshaled to JSON, so backward-compatibility
-// should be preserved.
-type entry struct {
- Name string
- Value string
- Domain string
- Path string
- Secure bool
- HttpOnly bool
- Persistent bool
- HostOnly bool
- Expires time.Time
- Creation time.Time
- LastAccess time.Time
-
- // Updated records when the cookie was updated.
- // This is different from creation time because a cookie
- // can be changed without updating the creation time.
- Updated time.Time
-
- // CanonicalHost stores the original canonical host name
- // that the cookie was associated with. We store this
- // so that even if the public suffix list changes (for example
- // when storing/loading cookies) we can still get the correct
- // jar keys.
- CanonicalHost string
-}
-
-// id returns the domain;path;name triple of e as an id.
-func (e *entry) id() string {
- return id(e.Domain, e.Path, e.Name)
-}
-
-// id returns the domain;path;name triple as an id.
-func id(domain, path, name string) string {
- return fmt.Sprintf("%s;%s;%s", domain, path, name)
-}
-
-// shouldSend determines whether e's cookie qualifies to be included in a
-// request to host/path. It is the caller's responsibility to check if the
-// cookie is expired.
-func (e *entry) shouldSend(https bool, host, path string) bool {
- return e.domainMatch(host) && e.pathMatch(path) && (https || !e.Secure)
-}
-
-// domainMatch implements "domain-match" of RFC 6265 section 5.1.3.
-func (e *entry) domainMatch(host string) bool {
- if e.Domain == host {
- return true
- }
- return !e.HostOnly && hasDotSuffix(host, e.Domain)
-}
-
-// pathMatch implements "path-match" according to RFC 6265 section 5.1.4.
-func (e *entry) pathMatch(requestPath string) bool {
- if requestPath == e.Path {
- return true
- }
- if strings.HasPrefix(requestPath, e.Path) {
- if e.Path[len(e.Path)-1] == '/' {
- return true // The "/any/" matches "/any/path" case.
- } else if requestPath[len(e.Path)] == '/' {
- return true // The "/any" matches "/any/path" case.
- }
- }
- return false
-}
-
-// hasDotSuffix reports whether s ends in "."+suffix.
-func hasDotSuffix(s, suffix string) bool {
- return len(s) > len(suffix) && s[len(s)-len(suffix)-1] == '.' && s[len(s)-len(suffix):] == suffix
-}
-
-type byCanonicalHost struct {
- byPathLength
-}
-
-func (s byCanonicalHost) Less(i, j int) bool {
- e0, e1 := &s.byPathLength[i], &s.byPathLength[j]
- if e0.CanonicalHost != e1.CanonicalHost {
- return e0.CanonicalHost < e1.CanonicalHost
- }
- return s.byPathLength.Less(i, j)
-}
-
-// byPathLength is a []entry sort.Interface that sorts according to RFC 6265
-// section 5.4 point 2: by longest path and then by earliest creation time.
-type byPathLength []entry
-
-func (s byPathLength) Len() int { return len(s) }
-
-func (s byPathLength) Less(i, j int) bool {
- e0, e1 := &s[i], &s[j]
- if len(e0.Path) != len(e1.Path) {
- return len(e0.Path) > len(e1.Path)
- }
- if !e0.Creation.Equal(e1.Creation) {
- return e0.Creation.Before(e1.Creation)
- }
- // The following are not strictly necessary
- // but are useful for providing deterministic
- // behaviour in tests.
- if e0.Name != e1.Name {
- return e0.Name < e1.Name
- }
- return e0.Value < e1.Value
-}
-
-func (s byPathLength) Swap(i, j int) { s[i], s[j] = s[j], s[i] }
-
-// Cookies implements the Cookies method of the http.CookieJar interface.
-//
-// It returns an empty slice if the URL's scheme is not HTTP or HTTPS.
-func (j *Jar) Cookies(u *url.URL) (cookies []*http.Cookie) {
- return j.cookies(u, time.Now())
-}
-
-// cookies is like Cookies but takes the current time as a parameter.
-func (j *Jar) cookies(u *url.URL, now time.Time) (cookies []*http.Cookie) {
- if u.Scheme != "http" && u.Scheme != "https" {
- return cookies
- }
- host, err := canonicalHost(u.Host)
- if err != nil {
- return cookies
- }
- key := jarKey(host, j.psList)
-
- j.mu.Lock()
- defer j.mu.Unlock()
-
- submap := j.entries[key]
- if submap == nil {
- return cookies
- }
-
- https := u.Scheme == "https"
- path := u.Path
- if path == "" {
- path = "/"
- }
-
- var selected []entry
- for id, e := range submap {
- if !e.Expires.After(now) {
- // Save some space by deleting the value when the cookie
- // expires. We can't delete the cookie itself because then
- // we wouldn't know that the cookie had expired when
- // we merge with another cookie jar.
- if e.Value != "" {
- e.Value = ""
- submap[id] = e
- }
- continue
- }
- if !e.shouldSend(https, host, path) {
- continue
- }
- e.LastAccess = now
- submap[id] = e
- selected = append(selected, e)
- }
-
- sort.Sort(byPathLength(selected))
- for _, e := range selected {
- cookies = append(cookies, &http.Cookie{Name: e.Name, Value: e.Value})
- }
-
- return cookies
-}
-
-// AllCookies returns all cookies in the jar. The returned cookies will
-// have Domain, Expires, HttpOnly, Name, Secure, Path, and Value filled
-// out. Expired cookies will not be returned. This function does not
-// modify the cookie jar.
-func (j *Jar) AllCookies() (cookies []*http.Cookie) {
- return j.allCookies(time.Now())
-}
-
-// allCookies is like AllCookies but takes the current time as a parameter.
-func (j *Jar) allCookies(now time.Time) []*http.Cookie {
- var selected []entry
- j.mu.Lock()
- defer j.mu.Unlock()
- for _, submap := range j.entries {
- for _, e := range submap {
- if !e.Expires.After(now) {
- // Do not return expired cookies.
- continue
- }
- selected = append(selected, e)
- }
- }
-
- sort.Sort(byCanonicalHost{byPathLength(selected)})
- cookies := make([]*http.Cookie, len(selected))
- for i, e := range selected {
- // Note: The returned cookies do not contain sufficient
- // information to recreate the database.
- cookies[i] = &http.Cookie{
- Name: e.Name,
- Value: e.Value,
- Path: e.Path,
- Domain: e.Domain,
- Expires: e.Expires,
- Secure: e.Secure,
- HttpOnly: e.HttpOnly,
- }
- }
-
- return cookies
-}
-
-// RemoveCookie removes the cookie matching the name, domain and path
-// specified by c.
-func (j *Jar) RemoveCookie(c *http.Cookie) {
- j.mu.Lock()
- defer j.mu.Unlock()
- id := id(c.Domain, c.Path, c.Name)
- key := jarKey(c.Domain, j.psList)
- if e, ok := j.entries[key][id]; ok {
- e.Value = ""
- e.Expires = time.Now().Add(-1 * time.Second)
- j.entries[key][id] = e
- }
-}
-
-// merge merges all the given entries into j. More recently changed
-// cookies take precedence over older ones.
-func (j *Jar) merge(entries []entry) {
- for _, e := range entries {
- if e.CanonicalHost == "" {
- continue
- }
- key := jarKey(e.CanonicalHost, j.psList)
- id := e.id()
- submap := j.entries[key]
- if submap == nil {
- j.entries[key] = map[string]entry{
- id: e,
- }
- continue
- }
- oldEntry, ok := submap[id]
- if !ok || e.Updated.After(oldEntry.Updated) {
- submap[id] = e
- }
- }
-}
-
-var expiryRemovalDuration = 24 * time.Hour
-
-// deleteExpired deletes all entries that have expired for long enough
-// that we can actually expect there to be no external copies of it that
-// might resurrect the dead cookie.
-func (j *Jar) deleteExpired(now time.Time) {
- for tld, submap := range j.entries {
- for id, e := range submap {
- if !e.Expires.After(now) && !e.Updated.Add(expiryRemovalDuration).After(now) {
- delete(submap, id)
- }
- }
- if len(submap) == 0 {
- delete(j.entries, tld)
- }
- }
-}
-
-// RemoveAllHost removes any cookies from the jar that were set for the given host.
-func (j *Jar) RemoveAllHost(host string) {
- host, err := canonicalHost(host)
- if err != nil {
- return
- }
- key := jarKey(host, j.psList)
-
- j.mu.Lock()
- defer j.mu.Unlock()
-
- expired := time.Now().Add(-1 * time.Second)
- submap := j.entries[key]
- for id, e := range submap {
- if e.CanonicalHost == host {
- // Save some space by deleting the value when the cookie
- // expires. We can't delete the cookie itself because then
- // we wouldn't know that the cookie had expired when
- // we merge with another cookie jar.
- e.Value = ""
- e.Expires = expired
- submap[id] = e
- }
- }
-}
-
-// SetCookies implements the SetCookies method of the http.CookieJar interface.
-//
-// It does nothing if the URL's scheme is not HTTP or HTTPS.
-func (j *Jar) SetCookies(u *url.URL, cookies []*http.Cookie) {
- j.setCookies(u, cookies, time.Now())
-}
-
-// setCookies is like SetCookies but takes the current time as parameter.
-func (j *Jar) setCookies(u *url.URL, cookies []*http.Cookie, now time.Time) {
- if len(cookies) == 0 {
- return
- }
- if u.Scheme != "http" && u.Scheme != "https" {
- // TODO is this really correct? It might be nice to send
- // cookies to websocket connections, for example.
- return
- }
- host, err := canonicalHost(u.Host)
- if err != nil {
- return
- }
- key := jarKey(host, j.psList)
- defPath := defaultPath(u.Path)
-
- j.mu.Lock()
- defer j.mu.Unlock()
-
- submap := j.entries[key]
- for _, cookie := range cookies {
- e, err := j.newEntry(cookie, now, defPath, host)
- if err != nil {
- continue
- }
- e.CanonicalHost = host
- id := e.id()
- if submap == nil {
- submap = make(map[string]entry)
- j.entries[key] = submap
- }
- if old, ok := submap[id]; ok {
- e.Creation = old.Creation
- } else {
- e.Creation = now
- }
- e.Updated = now
- e.LastAccess = now
- submap[id] = e
- }
-}
-
-// canonicalHost strips port from host if present and returns the canonicalized
-// host name.
-func canonicalHost(host string) (string, error) {
- var err error
- host = strings.ToLower(host)
- if hasPort(host) {
- host, _, err = net.SplitHostPort(host)
- if err != nil {
- return "", err
- }
- }
- if strings.HasSuffix(host, ".") {
- // Strip trailing dot from fully qualified domain names.
- host = host[:len(host)-1]
- }
- return toASCII(host)
-}
-
-// hasPort reports whether host contains a port number. host may be a host
-// name, an IPv4 or an IPv6 address.
-func hasPort(host string) bool {
- colons := strings.Count(host, ":")
- if colons == 0 {
- return false
- }
- if colons == 1 {
- return true
- }
- return host[0] == '[' && strings.Contains(host, "]:")
-}
-
-// jarKey returns the key to use for a jar.
-func jarKey(host string, psl PublicSuffixList) string {
- if isIP(host) {
- return host
- }
-
- var i int
- if psl == nil {
- i = strings.LastIndex(host, ".")
- if i == -1 {
- return host
- }
- } else {
- suffix := psl.PublicSuffix(host)
- if suffix == host {
- return host
- }
- i = len(host) - len(suffix)
- if i <= 0 || host[i-1] != '.' {
- // The provided public suffix list psl is broken.
- // Storing cookies under host is a safe stopgap.
- return host
- }
- }
- prevDot := strings.LastIndex(host[:i-1], ".")
- return host[prevDot+1:]
-}
-
-// isIP reports whether host is an IP address.
-func isIP(host string) bool {
- return net.ParseIP(host) != nil
-}
-
-// defaultPath returns the directory part of an URL's path according to
-// RFC 6265 section 5.1.4.
-func defaultPath(path string) string {
- if len(path) == 0 || path[0] != '/' {
- return "/" // Path is empty or malformed.
- }
-
- i := strings.LastIndex(path, "/") // Path starts with "/", so i != -1.
- if i == 0 {
- return "/" // Path has the form "/abc".
- }
- return path[:i] // Path is either of form "/abc/xyz" or "/abc/xyz/".
-}
-
-// newEntry creates an entry from a http.Cookie c. now is the current
-// time and is compared to c.Expires to determine deletion of c. defPath
-// and host are the default-path and the canonical host name of the URL
-// c was received from.
-//
-// The returned entry should be removed if its expiry time is in the
-// past. In this case, e may be incomplete, but it will be valid to call
-// e.id (which depends on e's Name, Domain and Path).
-//
-// A malformed c.Domain will result in an error.
-func (j *Jar) newEntry(c *http.Cookie, now time.Time, defPath, host string) (e entry, err error) {
- e.Name = c.Name
- if c.Path == "" || c.Path[0] != '/' {
- e.Path = defPath
- } else {
- e.Path = c.Path
- }
-
- e.Domain, e.HostOnly, err = j.domainAndType(host, c.Domain)
- if err != nil {
- return e, err
- }
- // MaxAge takes precedence over Expires.
- if c.MaxAge != 0 {
- e.Persistent = true
- e.Expires = now.Add(time.Duration(c.MaxAge) * time.Second)
- if c.MaxAge < 0 {
- return e, nil
- }
- } else if c.Expires.IsZero() {
- e.Expires = endOfTime
- } else {
- e.Persistent = true
- e.Expires = c.Expires
- if !c.Expires.After(now) {
- return e, nil
- }
- }
-
- e.Value = c.Value
- e.Secure = c.Secure
- e.HttpOnly = c.HttpOnly
-
- return e, nil
-}
-
-var (
- errIllegalDomain = errors.New("cookiejar: illegal cookie domain attribute")
- errMalformedDomain = errors.New("cookiejar: malformed cookie domain attribute")
- errNoHostname = errors.New("cookiejar: no host name available (IP only)")
-)
-
-// endOfTime is the time when session (non-persistent) cookies expire.
-// This instant is representable in most date/time formats (not just
-// Go's time.Time) and should be far enough in the future.
-var endOfTime = time.Date(9999, 12, 31, 23, 59, 59, 0, time.UTC)
-
-// domainAndType determines the cookie's domain and hostOnly attribute.
-func (j *Jar) domainAndType(host, domain string) (string, bool, error) {
- if domain == "" {
- // No domain attribute in the SetCookie header indicates a
- // host cookie.
- return host, true, nil
- }
-
- if isIP(host) {
- // According to RFC 6265 domain-matching includes not being
- // an IP address.
- // TODO: This might be relaxed as in common browsers.
- return "", false, errNoHostname
- }
-
- // From here on: If the cookie is valid, it is a domain cookie (with
- // the one exception of a public suffix below).
- // See RFC 6265 section 5.2.3.
- if domain[0] == '.' {
- domain = domain[1:]
- }
-
- if len(domain) == 0 || domain[0] == '.' {
- // Received either "Domain=." or "Domain=..some.thing",
- // both are illegal.
- return "", false, errMalformedDomain
- }
- domain = strings.ToLower(domain)
-
- if domain[len(domain)-1] == '.' {
- // We received stuff like "Domain=www.example.com.".
- // Browsers do handle such stuff (actually differently) but
- // RFC 6265 seems to be clear here (e.g. section 4.1.2.3) in
- // requiring a reject. 4.1.2.3 is not normative, but
- // "Domain Matching" (5.1.3) and "Canonicalized Host Names"
- // (5.1.2) are.
- return "", false, errMalformedDomain
- }
-
- // See RFC 6265 section 5.3 #5.
- if j.psList != nil {
- if ps := j.psList.PublicSuffix(domain); ps != "" && !hasDotSuffix(domain, ps) {
- if host == domain {
- // This is the one exception in which a cookie
- // with a domain attribute is a host cookie.
- return host, true, nil
- }
- return "", false, errIllegalDomain
- }
- }
-
- // The domain must domain-match host: www.mycompany.com cannot
- // set cookies for .ourcompetitors.com.
- if host != domain && !hasDotSuffix(host, domain) {
- return "", false, errIllegalDomain
- }
-
- return domain, false, nil
-}
-
-// DefaultCookieFile returns the default cookie file to use
-// for persisting cookie data.
-// The following names will be used in decending order of preference:
-// - the value of the $GOCOOKIES environment variable.
-// - $HOME/.go-cookies
-func DefaultCookieFile() string {
- if f := os.Getenv("GOCOOKIES"); f != "" {
- return f
- }
- return filepath.Join(homeDir(), ".go-cookies")
-}
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/ad28f33f/traffic_stats/vendor/github.com/juju/persistent-cookiejar/punycode.go
----------------------------------------------------------------------
diff --git a/traffic_stats/vendor/github.com/juju/persistent-cookiejar/punycode.go b/traffic_stats/vendor/github.com/juju/persistent-cookiejar/punycode.go
deleted file mode 100644
index ea7ceb5..0000000
--- a/traffic_stats/vendor/github.com/juju/persistent-cookiejar/punycode.go
+++ /dev/null
@@ -1,159 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package cookiejar
-
-// This file implements the Punycode algorithm from RFC 3492.
-
-import (
- "fmt"
- "strings"
- "unicode/utf8"
-)
-
-// These parameter values are specified in section 5.
-//
-// All computation is done with int32s, so that overflow behavior is identical
-// regardless of whether int is 32-bit or 64-bit.
-const (
- base int32 = 36
- damp int32 = 700
- initialBias int32 = 72
- initialN int32 = 128
- skew int32 = 38
- tmax int32 = 26
- tmin int32 = 1
-)
-
-// encode encodes a string as specified in section 6.3 and prepends prefix to
-// the result.
-//
-// The "while h < length(input)" line in the specification becomes "for
-// remaining != 0" in the Go code, because len(s) in Go is in bytes, not runes.
-func encode(prefix, s string) (string, error) {
- output := make([]byte, len(prefix), len(prefix)+1+2*len(s))
- copy(output, prefix)
- delta, n, bias := int32(0), initialN, initialBias
- b, remaining := int32(0), int32(0)
- for _, r := range s {
- if r < 0x80 {
- b++
- output = append(output, byte(r))
- } else {
- remaining++
- }
- }
- h := b
- if b > 0 {
- output = append(output, '-')
- }
- for remaining != 0 {
- m := int32(0x7fffffff)
- for _, r := range s {
- if m > r && r >= n {
- m = r
- }
- }
- delta += (m - n) * (h + 1)
- if delta < 0 {
- return "", fmt.Errorf("cookiejar: invalid label %q", s)
- }
- n = m
- for _, r := range s {
- if r < n {
- delta++
- if delta < 0 {
- return "", fmt.Errorf("cookiejar: invalid label %q", s)
- }
- continue
- }
- if r > n {
- continue
- }
- q := delta
- for k := base; ; k += base {
- t := k - bias
- if t < tmin {
- t = tmin
- } else if t > tmax {
- t = tmax
- }
- if q < t {
- break
- }
- output = append(output, encodeDigit(t+(q-t)%(base-t)))
- q = (q - t) / (base - t)
- }
- output = append(output, encodeDigit(q))
- bias = adapt(delta, h+1, h == b)
- delta = 0
- h++
- remaining--
- }
- delta++
- n++
- }
- return string(output), nil
-}
-
-func encodeDigit(digit int32) byte {
- switch {
- case 0 <= digit && digit < 26:
- return byte(digit + 'a')
- case 26 <= digit && digit < 36:
- return byte(digit + ('0' - 26))
- }
- panic("cookiejar: internal error in punycode encoding")
-}
-
-// adapt is the bias adaptation function specified in section 6.1.
-func adapt(delta, numPoints int32, firstTime bool) int32 {
- if firstTime {
- delta /= damp
- } else {
- delta /= 2
- }
- delta += delta / numPoints
- k := int32(0)
- for delta > ((base-tmin)*tmax)/2 {
- delta /= base - tmin
- k += base
- }
- return k + (base-tmin+1)*delta/(delta+skew)
-}
-
-// Strictly speaking, the remaining code below deals with IDNA (RFC 5890 and
-// friends) and not Punycode (RFC 3492) per se.
-
-// acePrefix is the ASCII Compatible Encoding prefix.
-const acePrefix = "xn--"
-
-// toASCII converts a domain or domain label to its ASCII form. For example,
-// toASCII("b�cher.example.com") is "xn--bcher-kva.example.com", and
-// toASCII("golang") is "golang".
-func toASCII(s string) (string, error) {
- if ascii(s) {
- return s, nil
- }
- labels := strings.Split(s, ".")
- for i, label := range labels {
- if !ascii(label) {
- a, err := encode(acePrefix, label)
- if err != nil {
- return "", err
- }
- labels[i] = a
- }
- }
- return strings.Join(labels, "."), nil
-}
-
-func ascii(s string) bool {
- for i := 0; i < len(s); i++ {
- if s[i] >= utf8.RuneSelf {
- return false
- }
- }
- return true
-}
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/ad28f33f/traffic_stats/vendor/github.com/juju/persistent-cookiejar/serialize.go
----------------------------------------------------------------------
diff --git a/traffic_stats/vendor/github.com/juju/persistent-cookiejar/serialize.go b/traffic_stats/vendor/github.com/juju/persistent-cookiejar/serialize.go
deleted file mode 100644
index 534f73e..0000000
--- a/traffic_stats/vendor/github.com/juju/persistent-cookiejar/serialize.go
+++ /dev/null
@@ -1,152 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package cookiejar
-
-import (
- "encoding/json"
- "io"
- "log"
- "os"
- "sort"
- "time"
-
- "gopkg.in/retry.v1"
-
- filelock "github.com/juju/go4/lock"
- "gopkg.in/errgo.v1"
-)
-
-// Save saves the cookies to the persistent cookie file.
-// Before the file is written, it reads any cookies that
-// have been stored from it and merges them into j.
-func (j *Jar) Save() error {
- return j.save(time.Now())
-}
-
-// save is like Save but takes the current time as a parameter.
-func (j *Jar) save(now time.Time) error {
- locked, err := lockFile(lockFileName(j.filename))
- if err != nil {
- return errgo.Mask(err)
- }
- defer locked.Close()
- f, err := os.OpenFile(j.filename, os.O_RDWR|os.O_CREATE, 0600)
- if err != nil {
- return errgo.Mask(err)
- }
- defer f.Close()
- // TODO optimization: if the file hasn't changed since we
- // loaded it, don't bother with the merge step.
-
- j.mu.Lock()
- defer j.mu.Unlock()
- if err := j.mergeFrom(f); err != nil {
- // The cookie file is probably corrupt.
- log.Printf("cannot read cookie file to merge it; ignoring it: %v", err)
- }
- j.deleteExpired(now)
- if err := f.Truncate(0); err != nil {
- return errgo.Notef(err, "cannot truncate file")
- }
- if _, err := f.Seek(0, 0); err != nil {
- return errgo.Mask(err)
- }
- return j.writeTo(f)
-}
-
-// load loads the cookies from j.filename. If the file does not exist,
-// no error will be returned and no cookies will be loaded.
-func (j *Jar) load() error {
- locked, err := lockFile(lockFileName(j.filename))
- if err != nil {
- return errgo.Mask(err)
- }
- defer locked.Close()
- f, err := os.Open(j.filename)
- if err != nil {
- if os.IsNotExist(err) {
- return nil
- }
- return err
- }
- defer f.Close()
- if err := j.mergeFrom(f); err != nil {
- return errgo.Mask(err)
- }
- return nil
-}
-
-// mergeFrom reads all the cookies from r and stores them in the Jar.
-func (j *Jar) mergeFrom(r io.Reader) error {
- decoder := json.NewDecoder(r)
- // Cope with old cookiejar format by just discarding
- // cookies, but still return an error if it's invalid JSON.
- var data json.RawMessage
- if err := decoder.Decode(&data); err != nil {
- if err == io.EOF {
- // Empty file.
- return nil
- }
- return err
- }
- var entries []entry
- if err := json.Unmarshal(data, &entries); err != nil {
- log.Printf("warning: discarding cookies in invalid format (error: %v)", err)
- return nil
- }
- j.merge(entries)
- return nil
-}
-
-// writeTo writes all the cookies in the jar to w
-// as a JSON array.
-func (j *Jar) writeTo(w io.Writer) error {
- encoder := json.NewEncoder(w)
- entries := j.allPersistentEntries()
- if err := encoder.Encode(entries); err != nil {
- return err
- }
- return nil
-}
-
-// allPersistentEntries returns all the entries in the jar, sorted by primarly by canonical host
-// name and secondarily by path length.
-func (j *Jar) allPersistentEntries() []entry {
- var entries []entry
- for _, submap := range j.entries {
- for _, e := range submap {
- if e.Persistent {
- entries = append(entries, e)
- }
- }
- }
- sort.Sort(byCanonicalHost{entries})
- return entries
-}
-
-// lockFileName returns the name of the lock file associated with
-// the given path.
-func lockFileName(path string) string {
- return path + ".lock"
-}
-
-var attempt = retry.LimitTime(3*time.Second, retry.Exponential{
- Initial: 100 * time.Microsecond,
- Factor: 1.5,
- MaxDelay: 100 * time.Millisecond,
-})
-
-func lockFile(path string) (io.Closer, error) {
- for a := retry.Start(attempt, nil); a.Next(); {
- locker, err := filelock.Lock(path)
- if err == nil {
- return locker, nil
- }
- if !a.More() {
- return nil, errgo.Notef(err, "file locked for too long; giving up")
- }
- }
- panic("unreachable")
-}
[2/2] incubator-trafficcontrol git commit: This closes #443
Posted by fr...@apache.org.
This closes #443
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/9d004e1e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/9d004e1e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/9d004e1e
Branch: refs/heads/2.0.x
Commit: 9d004e1ee46ecbca55a868899b086911f8f67d43
Parents: ad28f33
Author: Eric Friedrich <fr...@apache.org>
Authored: Mon Apr 10 10:17:11 2017 -0400
Committer: Eric Friedrich <fr...@apache.org>
Committed: Mon Apr 10 10:17:11 2017 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------