netrc.go: round-trip unknown keywords, tokens

Author: ttaylorr

netrc/examples/good.netrc

@@ -1,7 +1,7 @@
 # I am a comment
 machine mail.google.com
 	login [email protected]
-	account justagmail #end of line comment with trailing space 
+	account justagmail #end of line comment with trailing space
 	password somethingSecret
  # I am another comment
 
@@ -16,6 +16,12 @@ machine ray login demo password mypassword
 
 machine weirdlogin login uname password pass#pass
 
+machine google.com
+  login [email protected]
+  not-a-keyword
+  password secure
+  also-not-a-keyword
+
 default
 	login anonymous
 	password [email protected]

netrc/netrc.go

@@ -24,6 +24,7 @@ const (
 	tkMacdef
 	tkComment
 	tkWhitespace
+	tkUnknown
 )
 
 var keywords = map[string]tkType{
@@ -70,7 +71,7 @@ func (n *Netrc) MarshalText() (text []byte, err error) {
 	// TODO(bgentry): not safe for concurrency
 	for i := range n.tokens {
 		switch n.tokens[i].kind {
-		case tkComment, tkDefault, tkWhitespace: // always append these types
+		case tkComment, tkDefault, tkWhitespace, tkUnknown: // always append these types
 			text = append(text, n.tokens[i].rawkind...)
 		default:
 			if n.tokens[i].value != "" { // skip empty-value tokens
@@ -391,9 +392,11 @@ func parse(r io.Reader, pos int) (*Netrc, error) {
 		t, err = newToken(rawb)
 		if err != nil {
 			if currentMacro == nil {
-				return nil, &Error{pos, err.Error()}
+				t.kind = tkUnknown
+				nrc.tokens = append(nrc.tokens, t)
+			} else {
+				currentMacro.rawvalue = append(currentMacro.rawvalue, rawb...)
 			}
-			currentMacro.rawvalue = append(currentMacro.rawvalue, rawb...)
 			continue
 		}
 

netrc/netrc_test.go

@@ -18,6 +18,7 @@ var expectedMachines = []*Machine{
 	&Machine{Name: "mail.google.com", Login: "[email protected]", Password: "somethingSecret", Account: "justagmail"},
 	&Machine{Name: "ray", Login: "demo", Password: "mypassword", Account: ""},
 	&Machine{Name: "weirdlogin", Login: "uname", Password: "pass#pass", Account: ""},
+	&Machine{Name: "google.com", Login: "[email protected]", Password: "secure"},
 	&Machine{Name: "", Login: "anonymous", Password: "[email protected]", Account: ""},
 }
 var expectedMacros = Macros{
@@ -146,7 +147,7 @@ func TestFindMachine(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if !eqMachine(m, expectedMachines[3]) {
+	if !eqMachine(m, expectedMachines[4]) {
 		t.Errorf("bad machine; expected %v, got %v\n", expectedMachines[3], m)
 	}
 	if !m.IsDefault() {