Mirrors/restic
1
0
Fork 0
mirror of https://github.com/restic/restic.git synced 2025-03-16 00:00:05 +01:00
Code Issues Releases Wiki Activity

https scheme

Browse source
This commit is contained in:
Chapuis Bertil 2015-09-07 15:10:05 +02:00
parent 8f93488a94
commit ee076ffa77
2 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
backend/rest/rest.go
View file

@ -2,6 +2,7 @@ package rest
import (
"bytes"
"crypto/tls"
"encoding/json"
"errors"
"fmt"
@ -62,7 +63,8 @@ func (rb *RestBlob) Finalize(t backend.Type, name string) error {
rb.final = true
<-rb.b.connChan
resp, err := http.Post(restPath(rb.b.url, t, name), "binary/octet-stream", rb.buf)
client := *rb.b.client
resp, err := client.Post(restPath(rb.b.url, t, name), "binary/octet-stream", rb.buf)
defer resp.Body.Close()
if resp.StatusCode == 409 {
err = errors.New("already exists")
@ -82,6 +84,7 @@ func (rb *RestBlob) Size() uint {
type Rest struct {
url *url.URL
connChan chan struct{}
client *http.Client
}
// Open opens the http backend at the specified url.
@ -90,7 +93,11 @@ func Open(url *url.URL) (*Rest, error) {
for i := 0; i < connLimit; i++ {
connChan <- struct{}{}
}
return &Rest{url: url, connChan: connChan}, nil
tr := &http.Transport{
TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
}
client := http.Client{Transport: tr}
return &Rest{url: url, connChan: connChan, client: &client}, nil
}
// Location returns a string that specifies the location of the repository, like a URL.
@ -110,7 +117,7 @@ func (b *Rest) Create() (backend.Blob, error) {
// Get returns an io.ReadCloser for the Blob with the given name of type t.
func (b *Rest) Get(t backend.Type, name string) (io.ReadCloser, error) {
resp, err := http.Get(restPath(b.url, t, name))
resp, err := b.client.Get(restPath(b.url, t, name))
if err == nil && resp.StatusCode != 200 {
err = errors.New("blob not found")
}
@ -127,7 +134,8 @@ func (b *Rest) GetReader(t backend.Type, name string, offset, length uint) (io.R
req.Header.Add("Range", fmt.Sprintf("bytes=%d-%d", offset, offset+length))
resp, errg := http.DefaultClient.Do(req)
client := *b.client
resp, errg := client.Do(req)
if errg != nil {
return nil, errg
}
@ -144,7 +152,8 @@ func (b *Rest) Test(t backend.Type, name string) (bool, error) {
return found, err
}
resp, errh := http.DefaultClient.Do(req)
client := *b.client
resp, errh := client.Do(req)
defer resp.Body.Close()
if resp.StatusCode == 200 {
found = true
@ -159,7 +168,8 @@ func (b *Rest) Remove(t backend.Type, name string) error {
return err
}
resp, errd := http.DefaultClient.Do(req)
client := *b.client
resp, errd := client.Do(req)
defer resp.Body.Close()
return errd
}
@ -175,7 +185,8 @@ func (b *Rest) Close() error {
func (b *Rest) List(t backend.Type, done <-chan struct{}) <-chan string {
ch := make(chan string)
resp, err := http.Get(restPath(b.url, t, ""))
client := *b.client
resp, err := client.Get(restPath(b.url, t, ""))
defer resp.Body.Close()
if err != nil {
close(ch)

4
cmd/restic/global.go
View file

@ -157,7 +157,7 @@ func open(u string) (backend.Backend, error) {
if url.Scheme == "s3" {
return s3.Open(url.Host, url.Path[1:])
} else if url.Scheme == "http" {
} else if url.Scheme == "http" || url.Scheme == "https" {
return rest.Open(url)
}
@ -194,7 +194,7 @@ func create(u string) (backend.Backend, error) {
if url.Scheme == "s3" {
return s3.Open(url.Host, url.Path[1:])
} else if url.Scheme == "http" {
} else if url.Scheme == "http" || url.Scheme == "https" {
return rest.Open(url)
}