Commit Graph

5644 Commits

Author SHA1 Message Date
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
Jeromy Johnson
78ac786c7c Merge pull request #2493 from ipfs/feat/deps-cleanup
clean up dependencies
2016-03-25 11:00:23 -07:00
Michael Muré
c88e46cb52 clean deprecated Key.Pretty()
License: MIT
Signed-off-by: Michael Muré <batolettre@gmail.com>
2016-03-25 12:05:45 +01:00
Michael Muré
e2ea348143 correct import in fuse tests
License: MIT
Signed-off-by: Michael Muré <batolettre@gmail.com>
2016-03-25 12:00:43 +01:00
Jeromy
e9b1fe4cef clean up dependencies
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
2016-03-23 11:54:26 -07:00
Jeromy Johnson
2b6da0c024 Merge pull request #2471 from ipfs/feature/alphabetize-object
Alphabetized object subcommands
2016-03-21 19:44:31 -07:00
Jeromy Johnson
6da712a802 Merge pull request #2490 from ipfs/docker-gc
docker: start daemon with --enable-gc
2016-03-21 17:20:56 -07:00
Jeromy Johnson
eea2c56d84 Merge pull request #2486 from ipfs/docs/grammar-in-diag
Edited the grammar for diag
2016-03-21 15:28:09 -07:00
Lars Gierth
50127b2f58 docker: start daemon with --enable-gc
License: MIT
Signed-off-by: Lars Gierth <larsg@systemli.org>
2016-03-21 12:39:53 -04:00
Richard Littauer
5f0c997504 Edited the grammar for diag
License: MIT
Signed-off-by: Richard Littauer <richard.littauer@gmail.com>
2016-03-18 17:12:45 -04:00
Jeromy Johnson
7134930962 Merge pull request #2480 from kalmi/appveyor-fix
Appveyor fix to make it execute tests again
2016-03-17 17:43:02 -07:00
Tarnay Kálmán
420b02ed1f appveyor fix to make it execute tests again
(not green, but at least it executes)

License: MIT
Signed-off-by: Tarnay Kálmán <kalmisoft@gmail.com>
2016-03-18 01:23:41 +01:00
Jeromy Johnson
24d88da289 Merge pull request #2463 from dignifiedquire/webui-04
feat: Update the webui to work with the latest changes in 0.4
2016-03-15 14:16:51 -07:00
Richard Littauer
c692286b41 Alphabetized subcommands
License: MIT
Signed-off-by: Richard Littauer <richard.littauer@gmail.com>
2016-03-15 13:23:22 -04:00
Jeromy Johnson
573b191df2 Merge pull request #2465 from ipfs/fix/double-encoding-header
fix double transfer encoding header problem
2016-03-15 10:22:14 -07:00
Jeromy Johnson
655804c5ef fix whitespace trimming
License: MIT
Signed-off-by: Jeromy Johnson <why@ipfs.io>
2016-03-14 16:36:31 -07:00
Jeromy Johnson
850602361d fix double transfer encoding head problem
License: MIT
Signed-off-by: Jeromy Johnson <why@ipfs.io>
2016-03-14 16:26:49 -07:00
Jeromy Johnson
102a6dde22 Merge pull request #2451 from ipfs/t0300-improve-debug-message
t0300: improve docker_build debug message
2016-03-14 16:15:59 -07:00
dignifiedquire
c0ec80215e feat: Update the webui to work with the latest changes in 0.4
License: MIT
Signed-off-by: dignifiedquire <dignifiedquire@gmail.com>
2016-03-14 20:49:18 +01:00
Jeromy Johnson
286a5968c5 Merge pull request #2430 from diasdavid/feat/repo-stat
Feature: `ipfs repo stat`
2016-03-11 12:51:11 -08:00
Jeromy Johnson
82d5e2ed0a Merge pull request #2458 from ipfs/makefile-fixes
Makefile fixes
2016-03-10 12:15:32 -08:00
Lars Gierth
6c74ac0d91 build: have install task not depend on build tasks, unneccessary
License: MIT
Signed-off-by: Lars Gierth <larsg@systemli.org>
2016-03-10 19:26:57 +01:00
Lars Gierth
7d67b0a69c build: fix path_check for symlink-into-gopath usecase
License: MIT
Signed-off-by: Lars Gierth <larsg@systemli.org>
2016-03-10 19:23:12 +01:00
Jeromy Johnson
6f8ea136d5 Merge pull request #2455 from ipfs/feat/fix-hanging
update our libp2p dependency to fix hanging issue
2016-03-09 12:06:18 -08:00
Jeromy
97d583dd8f update libp2p dep
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
2016-03-09 09:53:19 -08:00
Jeromy
d8be357087 add new test to show problem
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
2016-03-09 09:50:00 -08:00
Christian Couder
94083ae624 t0300: improve docker_build debug message
License: MIT
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
2016-03-07 10:35:52 +01:00
David Dias
c10e329b78 repo-stat
License: MIT
Signed-off-by: David Dias <daviddias.p@gmail.com>
2016-03-04 23:45:03 +00:00
Jeromy Johnson
91c6f0f3db Merge pull request #2359 from mildred/ipld
Simplify merkledag package interface to ease IPLD inclusion
2016-03-04 12:02:37 -08:00
Jeromy Johnson
5f3945c9b7 Merge pull request #2443 from ipfs/feat/default-option-vals
add default option value support to commands lib
2016-03-04 11:30:46 -08:00
Jeromy
767ee13ea2 add default option value support to commands lib
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
2016-03-04 10:58:27 -08:00
Jeromy Johnson
39c101cd70 Merge pull request #2433 from ipfs/fix/t0060-port-zero
make t0060 use port zero
2016-03-04 09:31:21 -08:00
Mildred Ki'Lya
683b81760e merkledag/traverse: Fix tests after node pointer removal
License: MIT
Signed-off-by: Mildred Ki'Lya <mildred-pub.git@mildred.fr>
2016-03-04 07:51:27 +01:00
Jeromy Johnson
a75a5a3e22 Merge pull request #2442 from Neurone/master
Fixed some scripts
2016-03-03 22:49:32 -08:00