Skip to content
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.

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

merge with ipfs cluster master #5

Merged
merged 77 commits into from Jan 21, 2019
Merged
Changes from 1 commit
Commits
Show all changes
77 commits
Select commit Hold shift + click to select a range
1eea39b
Add the build tools download gateway.
yeewang Dec 18, 2018
eca10fd
add hive.cluster mark.
Dec 19, 2018
7c26f1e
Fix HTTPs with DNS multiaddresses
hsanjuan Dec 19, 2018
b93b2fe
Fix interpreting Host parameter correctly.
hsanjuan Dec 19, 2018
e9cf8ab
Added tests for /monitor/metrics/{metrics_type}
kishansagathiya Dec 14, 2018
61f86be
We are using https://github.com/chriscool/sharness
kishansagathiya Dec 17, 2018
6049b21
Sharness tests for ipfs-cluster-ctl health metrics
kishansagathiya Dec 17, 2018
fc67824
Added tests for /monitor/metrics/{metrics_type}
kishansagathiya Dec 21, 2018
13a161f
Merge ipfs-cluster branch 'ipfs-cluste/master' into feat_hive_dev
Dec 21, 2018
c0cdaa4
Merge pull request #626 from ipfs/fix/ctl-https
hsanjuan Jan 3, 2019
6353a81
Merge remote-tracking branch 'origin/master' into feat_hive_dev
Jan 3, 2019
b44c7fb
Merge pull request #622 from ipfs/issue_587
hsanjuan Jan 4, 2019
16297ce
Fix #632: Handle "stream-channels" in /add endpoints
hsanjuan Jan 4, 2019
a426d75
Fix $632: Test stream-channels=false in /add endpoint
hsanjuan Jan 4, 2019
99638cd
Fix #632: Apply -Q option to --enc=json when adding.
hsanjuan Jan 4, 2019
7c04dd1
Fix #445: Implemented status filter for ipfs-cluster-ctl
sona1111 Jun 23, 2018
02af6c1
Fix #445: Reduced length of filter help string
sona1111 Jun 24, 2018
bda9633
Fix #445:
sona1111 Jun 28, 2018
ed20241
Fix #445:
sona1111 Jun 28, 2018
f0321af
Status filters for `ipfs-cluster-ctl status`
kishansagathiya Dec 20, 2018
02e129f
Status filters for `ipfs-cluster-ctl status`
kishansagathiya Dec 20, 2018
bed9672
Status filters for `ipfs-cluster-ctl status`
kishansagathiya Dec 26, 2018
d0d9034
Status filters for `ipfs-cluster-ctl status`
kishansagathiya Dec 26, 2018
2c364dd
Status filters for `ipfs-cluster-ctl status`
kishansagathiya Jan 4, 2019
822c95a
Wrap help message for less than 120 characters
kishansagathiya Jan 4, 2019
706558c
Status filters for `ipfs-cluster-ctl status`
kishansagathiya Jan 5, 2019
596c1f5
Fix #632: Make sure StreamChannels is enabled in rest/client.
hsanjuan Jan 7, 2019
c51ff00
Feat #632: Keep default /add behaviour outside of conditional block
hsanjuan Jan 7, 2019
7de930b
Feat #445: Use TrackerStatus as filter. Simplify and small misc.
hsanjuan Jan 7, 2019
75702c2
Feat #445: Clarify about 0 filter value.
hsanjuan Jan 7, 2019
9871fd3
add uid register and uid name changing API.
Jan 8, 2019
3a86c29
add hive api: UidNew, UidLogIn, FilesCp, FilesFlush, FilesLs
Jan 8, 2019
fa5906c
Feat #445: Catch invalid filter strings in ipfs-cluster-ctl.
hsanjuan Jan 8, 2019
2e692e8
Issue #445: Fix test
hsanjuan Jan 8, 2019
595db7a
Merge pull request #633 from ipfs/feat/632-stream-channels
hsanjuan Jan 8, 2019
964ced6
Feat #445: Fix string test with TrackerStatus == 0
hsanjuan Jan 8, 2019
c28b3a9
add FilesMkdir, FilesMv, and FilesRm API.
Jan 8, 2019
d80f3ee
Merge pull request #627 from ipfs/issue_445
hsanjuan Jan 8, 2019
f936e52
Fix #632: Add --no-stream to ipfs-cluster-ctl
hsanjuan Jan 9, 2019
7972e4a
add FilesRead, FilesStat, FilesWrite.
Jan 10, 2019
7cd936f
Issue #632: Fix wrong name for flag. Address review comments
hsanjuan Jan 10, 2019
a0185fa
Fix #382 (again): A better strategy for handling proxy headers
hsanjuan Jan 10, 2019
66525fe
ipfsproxy: add ExtractHeaderTTL option to config
hsanjuan Jan 11, 2019
2a1eb3c
Fix #382: Add TTL for cached headers
hsanjuan Jan 11, 2019
bfbc652
Fix typos in comments
hsanjuan Jan 11, 2019
99ffabb
Fix #639: Import rs/cors with Gx
hsanjuan Jan 11, 2019
7067745
Fix #639: Add CORS options to restapi
hsanjuan Jan 11, 2019
adb290e
Fix #639: restapi: Handle CORS preflight requests (OPTIONS)
hsanjuan Jan 11, 2019
80bb66e
ipfsproxy: fix tests for new configuration keys
hsanjuan Jan 11, 2019
6bda1e3
ipfsproxy: fix typos in comments
hsanjuan Jan 11, 2019
a3720c2
restapi: minor codeclimate issue
hsanjuan Jan 11, 2019
efafe9b
Fix #639: Do not break start by complaining of unset CORSMaxAge
hsanjuan Jan 11, 2019
c9151f0
Fix #639: Enforce basic auth for all requests when enabled
hsanjuan Jan 11, 2019
afc4591
Sharness: update configuration files used in sharness
hsanjuan Jan 11, 2019
5075504
config: Fix confusing errors
hsanjuan Jan 11, 2019
2783186
sharness: Fix test typo causing an empty grep
hsanjuan Jan 11, 2019
e891c33
Config: Interpret empty duration strings as duration = 0.
hsanjuan Jan 11, 2019
7f30a5e
config: do not handle "" durations (and do not error)
hsanjuan Jan 12, 2019
b606c4b
Merge pull request #637 from ipfs/feat/632-stream-channels-client
hsanjuan Jan 14, 2019
935d984
Merge pull request #641 from ipfs/tests/update-sharness-configs
hsanjuan Jan 14, 2019
b93aad1
Merge pull request #638 from ipfs/fix/cors-and-headers
hsanjuan Jan 14, 2019
6b4b1bc
Update sharness/t0032-ctl-health.sh
kishansagathiya Jan 14, 2019
9685c08
sharness: test should check agains cluster peer ID
hsanjuan Jan 14, 2019
d33b274
Merge pull request #642 from ipfs/fix/config-errors
hsanjuan Jan 14, 2019
04cd9a5
Merge pull request #643 from ipfs/fix/sharness-jq-typo
hsanjuan Jan 14, 2019
19191cf
Release 0.8.0-rc1
hsanjuan Jan 14, 2019
f7bc468
gx publish 0.8.0-rc1
hsanjuan Jan 14, 2019
afe5acf
Changelog for 0.8.0 release
hsanjuan Jan 10, 2019
0d4af5d
Merge pull request #644 from ipfs/0.8.0/changelog
hsanjuan Jan 16, 2019
c37beea
Release 0.8.0
hsanjuan Jan 16, 2019
44f4ff2
gx publish 0.8.0
hsanjuan Jan 16, 2019
a244af9
Fix changelog date
hsanjuan Jan 16, 2019
284cba4
Merge branch 'dev-master' into feat_hive_dev
Jan 18, 2019
5d91766
Fix bug in filesWrite and add NamePublish.
Jan 19, 2019
1131e8c
add uid/info API
Jan 19, 2019
8cd0f3f
Merge remote-tracking branch 'remotes/ipfs/master' into hive-cluster
Jan 19, 2019
0500561
Merge remote-tracking branch 'origin/dev-master' into feat_merge_ipfs…
Jan 19, 2019
File filter...
Filter file types
Jump to…
Jump to file or symbol
Failed to load files and symbols.

Always

Just for now

Merge branch 'dev-master' into feat_hive_dev

Signed-off-by: Yi Wang <wangyi@storswift.com>
  • Loading branch information
Yi Wang
Yi Wang committed Jan 18, 2019
commit 284cba40ead549dcea9563009990bd9917629453
@@ -177,7 +177,7 @@ func New(cfg *Config) (*Server, error) {
}

// See: https://github.com/ipfs/go-ipfs/issues/5168
// See: https://github.com/elastos/Elastos.NET.Hive.Cluster/issues/548
// See: https://github.com/ipfs/ipfs-cluster/issues/548
// on why this is re-enabled.
s.SetKeepAlivesEnabled(true) // A reminder that this can be changed

@@ -675,6 +675,48 @@ func (proxy *Server) uidLogInHandler(w http.ResponseWriter, r *http.Request) {
return
}

func (proxy *Server) uidHandler(w http.ResponseWriter, r *http.Request) {
proxy.setHeaders(w.Header())

q := r.URL.Query()

oldUID := q.Get("uid")
if oldUID == "" {
ipfsErrorResponder(w, "error reading request: "+r.URL.String())
return
}

randName, err := uuid.NewV4()
if err != nil {
ipfsErrorResponder(w, err.Error())
return
}
newUID := "uid-" + randName.String()

UIDLogIn := api.UIDLogIn{}
err = proxy.rpcClient.Call(
"",
"Cluster",
"UidLogIn",
[]string{oldUID, newUID},
&UIDLogIn,
)
if err != nil {
ipfsErrorResponder(w, err.Error())
return
}

res := ipfsUidLogInResp{
UID: UIDLogIn.UID,
OldUID: UIDLogIn.OldUID,
PeerID: UIDLogIn.PeerID,
}
resBytes, _ := json.Marshal(res)
w.WriteHeader(http.StatusOK)
w.Write(resBytes)
return
}

func (proxy *Server) filesCpHandler(w http.ResponseWriter, r *http.Request) {
proxy.setHeaders(w.Header())

You are viewing a condensed version of this merge commit. You can view the full changes here.
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.