Commit Graph

673 Commits

Author SHA1 Message Date
Christian Couder
e8bc591fe5 t0170: remove useless 'echo' and add '&&'
License: MIT
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
2016-05-07 09:38:44 +02:00
Christian Couder
01bf209c31 t0170: put startup_cluster() call outside test_expect_success
startup_cluster() already contains some test_expect_success, so
it should not be inside one.

License: MIT
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
2016-05-07 09:37:04 +02:00
Kevin Atkinson
b84cbec2b6 Make blocks.Block an interface.
License: MIT
Signed-off-by: Kevin Atkinson <k@kevina.org>
2016-05-05 18:02:11 -04:00
Jeromy Johnson
fbf745fbcd Merge pull request #2632 from hsanjuan/issue_2434
"ipfs log ls" command
2016-05-05 12:17:37 -07:00
Jeromy Johnson
2862e58a6e Merge pull request #2581 from RealImage/default-config
Implements repository initialization with default config
2016-05-05 10:10:59 -07:00
Siva Chandran
6989686b8b Implements repository initialization with default config
Modified init command to receive default configuration from stdin. The changes enable us to use existing key-pair, datastore configuration while initializing new ipfs node.

License: MIT
Signed-off-by: Sivachandran <sivachandran.p@gmail.com>
2016-05-05 14:44:15 +05:30
Hector Sanjuan
57b494a70c Update go-log to 1.1.0 and fix calls to go-log.Uuid
License: MIT
Signed-off-by: Hector Sanjuan <code@hector.link>
2016-05-04 23:17:21 +02:00
Christian Couder
5b17654211 test/Makefile: use gx deps find for gx dependencies
License: MIT
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
2016-04-30 08:52:19 +02:00
Christian Couder
13354f31dc test/Makefile: add global-deps target
We need to make sure that go, gx, gx-go are properly installed.

License: MIT
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
2016-04-30 07:25:10 +02:00
Christian Couder
d4e7287980 sharness/Makefile: check global dependencies
License: MIT
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
2016-04-30 07:17:36 +02:00
Christian Couder
857fce168a Replace existing iptb dependencies with the gx one
Now that iptb has been added as a gx dependency, we can replace
existing dependencies with the one from gx.

License: MIT
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
2016-04-30 07:17:36 +02:00
Richard Littauer
f60ae0a1b9 Capitalized NOTE, first letter of following word
License: MIT
Signed-off-by: Richard Littauer <richard.littauer@gmail.com>
2016-04-29 16:57:19 -04:00
Stephen Whitmore
0a45ada4ed CLI: discoverability and consistency (#2542)
* reduces help indent from 4 to 2 spaces

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* reduces horz/vert space taken by "ipfs" cmd

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* show subcommands on shorthelp

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* Drops colons at the end of cmd headings.

This makes command headings consistent with the output of 'ipfs', which
does not include colons.

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* more consistent output between short-/long-help

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* Puts DESCRIPTION before SUBCOMMANDS.

Users likely want to understand what a command does before worrying
about its subcommands.

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* Keeps ipfs cmd from outputting its subcmds twice.

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* Removes redundant synopsis from "file"

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* Removes extra whitespace from longhelp

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* Consistent spacing whether SUBCMDS or not.

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* Removes redundant SUBCMD output from ipfs object.

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* Removes redundant synopsis from "name"

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* Newline after Description only if it exists.

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* Removes redundant synopsis from "bootstrap"

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* Removes redundant synopsis from "swarm"

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* Removes trailing newline in ping help.

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* Prints shorthelp on parse error.

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* tiny comment fixes

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* updates README usage

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* Don't include extra whitespace if no .MoreHelp

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* description improvements

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* Hides the obscure 'file' subcommand.

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* Splits 'ipfs daemon' into Short and Long help.

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* Removes redundant synopsis from "config"

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* Wraps lines to keep from going over 80.

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* specify repo separately

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* s/structure/hierarchy

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* missing .

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* Removes trailing colon from 'usage' test.

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* Updates sharness test error messages.

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* Removes trailing colon from 'usage' test.

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* Updates add-symlink to use /bin/sh.

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* Removes "hierarchy".

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* Updates "ipfs ping" synopsis.

* Updates t0040 with latest wording.

* Removes unnecessary daemon setup.

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>
2016-04-28 14:08:32 -07:00
Lars Gierth
e933a57976 docker: allow IPFS_LOGGING to be passed
License: MIT
Signed-off-by: Lars Gierth <larsg@systemli.org>
2016-04-28 20:57:02 +02:00
Jeromy
cffec77cea update libp2p with utp dep
License: MIT
Signed-off-by: Jeromy <why@ipfs.io>
2016-04-27 14:10:54 -07:00
Jeromy Johnson
49ea0f835e Merge pull request #2608 from ipfs/fix-docker-build
Dockerfile: use go version 1.5.4-r0
2016-04-27 14:08:44 -07:00
michael
46bcdce15d commands: repo fsck (#2597)
* Adds repo fsck subcommand

Fixes #2457

License: MIT
Signed-off-by: Mike Pfister <pfista@gmail.com>

* Checks for error on file deletion

License: MIT
Signed-off-by: Mike Pfister <pfista@gmail.com>

* Checks if node is online

License: MIT
Signed-off-by: Mike Pfister <pfista@gmail.com>

* Update error checking

License: MIT
Signed-off-by: Michael Pfister <pfista@gmail.com>

* Prevents command from running while daemon is running

License: MIT
Signed-off-by: Michael Pfister <pfista@gmail.com>

* Add newline to command output message

License: MIT
Signed-off-by: Michael Pfister <pfista@gmail.com>

* removing superfluous error

License: MIT
Signed-off-by: Michael Pfister <pfista@gmail.com>

* Adds sharness test for repo fsck command

License: MIT
Signed-off-by: Michael Pfister <pfista@gmail.com>

* Ignore warning if file doesn't exist

License: MIT
Signed-off-by: Michael Pfister <pfista@gmail.com>

* Updating message output

License: MIT
Signed-off-by: Michael Pfister <pfista@gmail.com>

* adding debug statements

License: MIT
Signed-off-by: Michael Pfister <pfista@gmail.com>

* update and add fsck sharness tests

License: MIT
Signed-off-by: Michael Pfister <pfista@gmail.com>

* updating comments

License: MIT
Signed-off-by: Michael Pfister <pfista@gmail.com>

* Use printf in test

Using printf prevents a newline from being printed to the api test file. When
the newline was present, multiaddr threw errors  trying to parse the api address
to an integer since the newline character was present.

License: MIT
Signed-off-by: Michael Pfister <pfista@gmail.com>

* updating tests

License: MIT
Signed-off-by: Michael Pfister <pfista@gmail.com>

* removing commented code

License: MIT
Signed-off-by: Michael Pfister <pfista@gmail.com>
2016-04-27 13:28:53 -07:00
Jeromy
01fd30069f bump test/Dockerfile go version to 1.5.4
License: MIT
Signed-off-by: Jeromy <why@ipfs.io>
2016-04-27 13:11:39 -07:00
Stephen Whitmore
5d25fc1f16 unix-friendly output for 'ipfs dht' commands (#2560)
* Cleans up 'ipfs dht findpeer' output

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* Adds more docs for 'ipfs dht put'.

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* Write pretty peer ids for ipfs dht put.

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* Writes pretty peer ids for ipfs dht query.

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* Suppresses unrecognized event type for FinalPeer.

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* Improves helptext on dht commands.

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* Adds 'ipfs dht findpeer' sharness test.

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* Adds sharness tests for remaining DHT commands.

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* Uses bash tests rather than 'test' command.

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* Removes commented code.

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* Removes unneeded init_ipfs.

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* Tweaks iptb setup.

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* Tweaks wording on dht 'put' and 'get'.

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* Removes extraneous ).

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* Removes apostrophe.

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* Tests the expected peer addresses.

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* Gets peer id using iptb.

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* Checks explicitly for common put/findprovs peers.

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* Sorts expected/actual findpeer results.

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>

* Fix disconnect argument description

License: MIT
Signed-off-by: Richard Littauer <richard.littauer@gmail.com>

* Fixes sort order in t0170-dht.sh.

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>
2016-04-27 09:31:06 -07:00
Jeromy Johnson
8ab1b8b2cb Merge pull request #2576 from ipfs/update-libp2p
Update go-libp2p
2016-04-18 15:31:10 -07:00
Jeromy Johnson
2509631c29 Merge pull request #2531 from noffle/output-dirs-on-add
Outputs added directories as they are traversed.
2016-04-18 13:29:44 -07:00
Jeromy Johnson
a8b7c9adec Merge pull request #2562 from ipfs/feat/object-diff
implement object diff command
2016-04-18 12:53:48 -07:00
Lars Gierth
00ec976e1d Use extracted go-libp2p-crypto, -secio, -peer packages
License: MIT
Signed-off-by: Lars Gierth <larsg@systemli.org>
2016-04-16 21:48:06 -07:00
Lars Gierth
907f4fadbd Update go-libp2p
License: MIT
Signed-off-by: Lars Gierth <larsg@systemli.org>
2016-04-16 21:23:47 -07:00
Jeromy
7e7fcb35ea changes from CR feedback
License: MIT
Signed-off-by: Jeromy <why@ipfs.io>
2016-04-16 12:23:34 -07:00
Lars Gierth
f7230b0480 repo: don't create logs directory, not used any longer
License: MIT
Signed-off-by: Lars Gierth <larsg@systemli.org>
2016-04-15 13:50:46 -07:00
Jeromy
bf7da8522c basic implementation of object diff
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
2016-04-14 13:06:51 -07:00
Jeromy
e79e1d31e9 remove a ton of unused godeps
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
2016-04-13 11:23:10 -07:00
Jeromy Johnson
185a3a6be9 Merge pull request #2523 from ipfs/clean-all-bins
sharness/Makefile: clean all BINS when cleaning
2016-04-12 18:57:06 -07:00
Stephen Whitmore
6d25aca9ed Adds tests to make sure 'object patch' writes.
Tests to ensure that object patching writes to the block store.

License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>
2016-04-12 17:22:06 -07:00
Stephen Whitmore
3876f1b98e More thorough ipfs add test.
License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>
2016-04-12 13:03:11 -07:00
Stephen Whitmore
d30152cfe9 Adds tests for "ipfs add -rn"
License: MIT
Signed-off-by: Stephen Whitmore <noffle@ipfs.io>
2016-04-12 13:03:11 -07:00
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
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
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
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
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
Christian Couder
908fb95bb1 sharness/Makefile: clean all BINS when cleaning
License: MIT
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
2016-04-03 13:02:04 +02: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
e9b1fe4cef clean up dependencies
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
2016-03-23 11:54:26 -07: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
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
97d583dd8f update libp2p dep
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
2016-03-09 09:53:19 -08:00