Rework mutable namespace resolution to handle recursion #1208
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| package commands | ||
|
|
||
| import ( | ||
| "io" | ||
| "strings" | ||
|
|
||
| cmds "github.com/ipfs/go-ipfs/commands" | ||
| namesys "github.com/ipfs/go-ipfs/namesys" | ||
| util "github.com/ipfs/go-ipfs/util" | ||
| ) | ||
|
|
||
| var DNSCmd = &cmds.Command{ | ||
| Helptext: cmds.HelpText{ | ||
| Tagline: "DNS link resolver", | ||
| ShortDescription: ` | ||
| Multihashes are hard to remember, but domain names are usually easy to | ||
| remember. To create memorable aliases for multihashes, DNS TXT | ||
| records can point to other DNS links, IPFS objects, IPNS keys, etc. | ||
| This command resolves those links to the referenced object. | ||
| `, | ||
| LongDescription: ` | ||
| Multihashes are hard to remember, but domain names are usually easy to | ||
| remember. To create memorable aliases for multihashes, DNS TXT | ||
| records can point to other DNS links, IPFS objects, IPNS keys, etc. | ||
| This command resolves those links to the referenced object. | ||
|
|
||
| For example, with this DNS TXT record: | ||
|
|
||
| ipfs.io. TXT "dnslink=/ipfs/QmRzTuh2Lpuz7Gr39stNr6mTFdqAghsZec1JoUnfySUzcy ..." | ||
|
|
||
| The resolver will give: | ||
|
|
||
| > ipfs dns ipfs.io | ||
| /ipfs/QmRzTuh2Lpuz7Gr39stNr6mTFdqAghsZec1JoUnfySUzcy | ||
|
|
||
| And with this DNS TXT record: | ||
|
|
||
| ipfs.ipfs.io. TXT "dnslink=/dns/ipfs.io ..." | ||
|
|
||
| The resolver will give: | ||
|
|
||
| > ipfs dns ipfs.io | ||
|
There was a problem hiding this comment. i think this needs to be There was a problem hiding this comment. On Thu, May 14, 2015 at 09:21:34PM -0700, Juan Batiz-Benet wrote:
So two questions:
|
||
| /dns/ipfs.io | ||
| > ipfs dns --recursive | ||
| /ipfs/QmRzTuh2Lpuz7Gr39stNr6mTFdqAghsZec1JoUnfySUzcy | ||
| `, | ||
| }, | ||
|
|
||
| Arguments: []cmds.Argument{ | ||
| cmds.StringArg("domain-name", true, false, "The domain-name name to resolve.").EnableStdin(), | ||
| }, | ||
| Options: []cmds.Option{ | ||
| cmds.BoolOption("recursive", "r", "Resolve until the result is not a DNS link"), | ||
| }, | ||
| Run: func(req cmds.Request, res cmds.Response) { | ||
|
|
||
| recursive, _, _ := req.Option("recursive").Bool() | ||
| name := req.Arguments()[0] | ||
| resolver := namesys.NewDNSResolver() | ||
|
|
||
| depth := 1 | ||
| if recursive { | ||
| depth = namesys.DefaultDepthLimit | ||
| } | ||
| output, err := resolver.ResolveN(req.Context().Context, name, depth) | ||
| if err != nil { | ||
| res.SetError(err, cmds.ErrNormal) | ||
| return | ||
| } | ||
| res.SetOutput(&ResolvedPath{output}) | ||
| }, | ||
| Marshalers: cmds.MarshalerMap{ | ||
| cmds.Text: func(res cmds.Response) (io.Reader, error) { | ||
| output, ok := res.Output().(*ResolvedPath) | ||
| if !ok { | ||
| return nil, util.ErrCast() | ||
| } | ||
| return strings.NewReader(output.Path.String()), nil | ||
| }, | ||
| }, | ||
| Type: ResolvedPath{}, | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| package commands | ||
|
|
||
| import ( | ||
| "errors" | ||
| "io" | ||
| "strings" | ||
|
|
||
| cmds "github.com/ipfs/go-ipfs/commands" | ||
| namesys "github.com/ipfs/go-ipfs/namesys" | ||
| u "github.com/ipfs/go-ipfs/util" | ||
| ) | ||
|
|
||
| var ipnsCmd = &cmds.Command{ | ||
|
There was a problem hiding this comment. very minor thing-- i think we'll later want this to be something like |
||
| Helptext: cmds.HelpText{ | ||
| Tagline: "Gets the value currently published at an IPNS name", | ||
| ShortDescription: ` | ||
| IPNS is a PKI namespace, where names are the hashes of public keys, and | ||
| the private key enables publishing new (signed) values. In resolve, the | ||
| default value of <name> is your own identity public key. | ||
| `, | ||
| LongDescription: ` | ||
| IPNS is a PKI namespace, where names are the hashes of public keys, and | ||
| the private key enables publishing new (signed) values. In resolve, the | ||
| default value of <name> is your own identity public key. | ||
|
|
||
|
|
||
| Examples: | ||
|
|
||
| Resolve the value of your identity: | ||
|
|
||
| > ipfs name resolve | ||
| QmatmE9msSfkKxoffpHwNLNKgwZG8eT9Bud6YoPab52vpy | ||
|
|
||
| Resolve the value of another name: | ||
|
|
||
| > ipfs name resolve QmbCMUZw6JFeZ7Wp9jkzbye3Fzp2GGcPgC3nmeUjfVF87n | ||
| QmatmE9msSfkKxoffpHwNLNKgwZG8eT9Bud6YoPab52vpy | ||
|
|
||
| `, | ||
| }, | ||
|
|
||
| Arguments: []cmds.Argument{ | ||
| cmds.StringArg("name", false, false, "The IPNS name to resolve. Defaults to your node's peerID.").EnableStdin(), | ||
| }, | ||
| Options: []cmds.Option{ | ||
| cmds.BoolOption("recursive", "r", "Resolve until the result is not an IPNS name"), | ||
| }, | ||
| Run: func(req cmds.Request, res cmds.Response) { | ||
|
|
||
| n, err := req.Context().GetNode() | ||
| if err != nil { | ||
| res.SetError(err, cmds.ErrNormal) | ||
| return | ||
| } | ||
|
|
||
| if !n.OnlineMode() { | ||
| err := n.SetupOfflineRouting() | ||
| if err != nil { | ||
| res.SetError(err, cmds.ErrNormal) | ||
| return | ||
| } | ||
| } | ||
|
|
||
| var name string | ||
|
|
||
| if len(req.Arguments()) == 0 { | ||
| if n.Identity == "" { | ||
| res.SetError(errors.New("Identity not loaded!"), cmds.ErrNormal) | ||
| return | ||
| } | ||
| name = n.Identity.Pretty() | ||
|
|
||
| } else { | ||
| name = req.Arguments()[0] | ||
| } | ||
|
|
||
| recursive, _, _ := req.Option("recursive").Bool() | ||
| depth := 1 | ||
| if recursive { | ||
| depth = namesys.DefaultDepthLimit | ||
| } | ||
|
|
||
| resolver := namesys.NewRoutingResolver(n.Routing) | ||
| output, err := resolver.ResolveN(n.Context(), name, depth) | ||
| if err != nil { | ||
| res.SetError(err, cmds.ErrNormal) | ||
| return | ||
| } | ||
|
|
||
| // TODO: better errors (in the case of not finding the name, we get "failed to find any peer in table") | ||
|
There was a problem hiding this comment. failed to find any peers in table means that bootstrapping was not successful, not that a lookup necessarily resulted in 'not found' |
||
|
|
||
| res.SetOutput(&ResolvedPath{output}) | ||
| }, | ||
| Marshalers: cmds.MarshalerMap{ | ||
| cmds.Text: func(res cmds.Response) (io.Reader, error) { | ||
| output, ok := res.Output().(*ResolvedPath) | ||
| if !ok { | ||
| return nil, u.ErrCast() | ||
| } | ||
| return strings.NewReader(output.Path.String()), nil | ||
| }, | ||
| }, | ||
| Type: ResolvedPath{}, | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍 to this command :)