Jeromy Johnson
6c8bebbedd
Merge pull request #2257 from ipfs/feat/promise-fail
...
allow promises to fail
2016-04-12 11:52:13 -07:00
Jeromy
5a0b6e593a
small sharness test for promise failure checking
...
License: MIT
Signed-off-by: Jeromy <why@ipfs.io>
2016-04-12 11:21:34 -07:00
Jeromy
cf7f5da426
don't fail promises that already succeeded
...
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
2016-04-12 10:43:23 -07:00
Jeromy Johnson
8d7117f55a
Merge pull request #2549 from ipfs/datastore-config
...
repo: properly init Datastore config, and leave it be
2016-04-12 10:41:20 -07:00
Jeromy Johnson
53c94ef7b4
Merge pull request #2356 from ipfs/prometheus2
...
metrics: rework prometheus integration
2016-04-12 10:31:43 -07:00
Lars Gierth
0e906466e7
godeps: remove prometheus and deps
...
License: MIT
Signed-off-by: Lars Gierth <larsg@systemli.org>
2016-04-11 19:37:06 -07:00
Lars Gierth
caec086c28
metrics: add prometheus back
...
With a proper IpfsCollector object and tests, this time.
The collector object makes it easy to add further metrics,
like e.g. bitswap wants/provs.
License: MIT
Signed-off-by: Lars Gierth <larsg@systemli.org>
2016-04-11 19:33:16 -07:00
Lars Gierth
a79907b7c1
repo: properly init Datastore config, and leave it be
...
We didn't previously initialize the Datastore config section.
The respective function exists, but was dead code up until now.
This lead to weird decisions like the GC code deciding on defaults,
and writing these to the config file. Don't want GC to touch the config.
License: MIT
Signed-off-by: Lars Gierth <larsg@systemli.org>
2016-04-11 16:21:14 -07:00
Juan Benet
daaa69e276
Merge pull request #2548 from ipfs/fix/libp2p-listen-hang
...
update libp2p dep to fix hanging listeners problem
2016-04-11 16:21:43 -04:00
Jeromy
bdc5456d52
update libp2p dep to fix hanging listeners problem
...
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
2016-04-11 12:52:54 -07:00
Jeromy Johnson
a957b4b9c1
Merge pull request #2541 from ipfs/feat/roadmap
...
add roadmap.md
2016-04-08 16:06:32 -07:00
Jeromy
831a695930
add roadmap.md
...
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
2016-04-08 16:05:32 -07:00
Jeromy Johnson
ab8879c433
Merge pull request #2538 from ipfs/feat/config-cleanup
...
clean up dead code and config fields
2016-04-08 15:09:45 -07:00
Jeromy
38b21e4296
remove test for removed dead config version fields
...
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
2016-04-08 13:54:12 -07:00
Jeromy
74fad48e4b
clean up dead code and config fields
...
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
2016-04-08 13:11:30 -07:00
Jeromy Johnson
8784e606b2
Merge pull request #2537 from noffle/files-api-help
...
Adds Files API cmd to helptext
2016-04-08 12:35:08 -07:00
Stephen Whitmore
c89723d316
Adds files api cmd to helptext
...
License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>
2016-04-08 12:33:00 -07:00
Jeromy Johnson
016f18c89c
Merge pull request #2340 from ipfs/fix/key-escape
...
fix dht command key escaping
2016-04-08 12:20:06 -07:00
Jeromy Johnson
e7dfd778af
Merge pull request #2536 from ipfs/dev-version-bump-0.4.1
...
bump ipfs dev version to 0.4.1
2016-04-08 11:46:51 -07:00
Jeromy
1b90fab38f
bump ipfs dev version to 0.4.1
...
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
2016-04-08 11:31:45 -07:00
Jeromy
d84dfafe69
allow promises to fail
...
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
2016-04-08 11:26:21 -07:00
Jeromy
00e4472dff
Remove debug log
...
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
2016-04-08 11:23:21 -07:00
Jeromy
c5b2e09708
test for the dht key escaping
...
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
2016-04-08 11:23:21 -07:00
Jeromy
65c66fd09b
fix dht command key escaping
...
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
2016-04-08 11:23:21 -07:00
Jeromy
600c95eb53
version bump to 0.4.0
...
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
2016-04-07 16:22:41 -07:00
Jeromy
a164fc958f
Ipfs v0.4.0 changelog
...
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
2016-04-07 16:22:21 -07:00
Jeromy Johnson
8a0bd6ce67
Merge pull request #2532 from ipfs/deps/libp2p/msscrypto
...
switch to new libp2p with mss crypto
2016-04-07 15:55:33 -07:00
Jeromy
e9edd2d884
use nc -w instead of -q because osx is slow
...
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
2016-04-07 15:55:41 -07:00
Jeromy
42455d27b3
multistream tests use data from file
...
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
2016-04-07 15:55:41 -07:00
Jeromy
3148f4c34f
fix tests that check swarm port knocking
...
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
2016-04-07 15:55:41 -07:00
Jeromy
8f3a51ac42
switch to new libp2p with mss crypto
...
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
2016-04-07 15:55:41 -07:00
Jeromy Johnson
5db8b1666f
Merge pull request #2466 from ipfs/feat/fd-limit-check
...
try to raise ulimit if its too low
2016-04-07 12:46:03 -07:00
Jeromy
e661832575
hide fd adjusting code behind daemon feature flag
...
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
2016-04-07 07:41:09 -07:00
Jeromy
0cb01acd71
don't use Max for setting Current
...
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
2016-04-06 18:09:50 -07:00
Jeromy
48ee44c46a
try to raise ulimit if its too low
...
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
2016-04-06 18:09:50 -07:00
Jeromy Johnson
ae3fed721f
Merge pull request #2520 from slothbag/sloth_b64_fix
...
Add option to decode 'Data' field as base64
2016-04-04 20:00:25 -07:00
Jeromy Johnson
c6e6bb056a
Merge pull request #1988 from ipfs/ipfs-prefix-hardening
...
gateway: harden path prefix
2016-04-04 16:08:26 -07:00
Lars Gierth
09937f84b6
gateway: enforce allowlist for path prefixes
...
The gateway accepts an X-Ipfs-Path-Prefix header,
and assumes that it is mounted in a reverse proxy
like nginx, at this path. Links in directory listings,
as well as trailing-slash redirects need to be rewritten
with that prefix in mind.
We don't want a potential attacker to be able to
pass in arbitrary path prefixes, which would end up
in redirects and directory listings, which is why
every prefix has to be explicitly allowed in the config.
Previously, we'd accept *any* X-Ipfs-Path-Prefix header.
Example:
We mount blog.ipfs.io (a dnslink page) at ipfs.io/blog.
nginx_ipfs.conf:
location /blog/ {
rewrite "^/blog(/.*)$" $1 break;
proxy_set_header Host blog.ipfs.io;
proxy_set_header X-Ipfs-Gateway-Prefix /blog;
proxy_pass http://127.0.0.1:8080 ;
}
.ipfs/config:
"Gateway": {
"PathPrefixes": ["/blog"],
// ...
},
dnslink:
> dig TXT _dnslink.blog.ipfs.io
dnslink=/ipfs/QmWcBjXPAEdhXDATV4ghUpkAonNBbiyFx1VmmHcQe9HEGd
License: MIT
Signed-off-by: Lars Gierth <larsg@systemli.org>
2016-04-04 16:31:57 -04:00
slothbag
bd5e08ca9b
datafieldenc switch statement
...
License: MIT
Signed-off-by: slothbag <slothbag@gmail.com>
2016-04-04 13:21:39 +10:00
slothbag
edf0bb0544
Tidy up object put cmd defaults
...
License: MIT
Signed-off-by: slothbag <slothbag@gmail.com>
2016-04-04 13:09:22 +10:00
slothbag
903a4851b7
Add option to decode 'Data' field as base64
...
License: MIT
Signed-off-by: slothbag@gmail.com <slothbag@gmail.com>
2016-04-04 12:55:27 +10:00
Jeromy Johnson
8acd87d799
Merge pull request #2477 from Stebalien/pin-fixes
...
Pin command fixes
2016-03-31 08:10:18 -07:00
Steven Allen
f15abc223c
use the builtin option parser to set the default for ipfs pin ls --type
...
License: MIT
Signed-off-by: Steven Allen <steven@stebalien.com>
2016-03-30 20:00:40 -04:00
Steven Allen
ef4e8837c6
change ipfs pin response field name from Pinned to Pins
...
This way, we don't claim to pin when unpinning.
License: MIT
Signed-off-by: Steven Allen <steven@stebalien.com>
2016-03-30 20:00:40 -04:00
Jeromy Johnson
87cf84ebc0
Merge pull request #2515 from ipfs/feat/update-utp
...
update utp dep
2016-03-30 05:41:14 -07:00
Jeromy
9f75ac4d75
update utp and cleanup more godeps along the way
...
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
2016-03-29 19:18:14 -07:00
Jeromy Johnson
f353394617
Merge pull request #2511 from Stebalien/local-api
...
Allow users to override the IPFS API address when fetching dependencies
2016-03-29 07:10:39 -07:00
Steven Allen
5b763e8a08
allow users to override the IPFS API address when fetching dependencies
...
License: MIT
Signed-off-by: Steven Allen <steven@stebalien.com>
2016-03-28 10:14:50 -07:00
Jeromy Johnson
45e1f757d2
Merge pull request #2502 from MichaelMure/fix_fuse_test
...
correct import in fuse tests
2016-03-27 17:44:01 -07:00
Jeromy Johnson
18da0a40b0
Merge pull request #2503 from MichaelMure/pretty
...
clean deprecated Key.Pretty()
2016-03-25 14:50:20 -07:00