add ContactInfo torrc parsing

mmcloughlin · Oct 24, 2017 · e7e787d · e7e787d
1 parent c242346
commit e7e787d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/torconfig/torrc.go b/torconfig/torrc.go
@@ -22,8 +22,9 @@ type optionHandler func(*Config, string) error
 // optionHandlers is a map from keywords (lowercased) to the associated
 // handler. Used by ParseTorrc.
 var optionHandlers = map[string]optionHandler{
-	"nickname": nicknameHandler,
-	"orport":   orPortHandler,
+	"nickname":    nicknameHandler,
+	"orport":      orPortHandler,
+	"contactinfo": contactInfoHandler,
 }
 
 // ParseTorrc parses Config from the given reader (in torrc format).
@@ -94,3 +95,9 @@ func orPortHandler(cfg *Config, args string) error {
 	cfg.ORPort = uint16(port)
 	return nil
 }
+
+// contactInfoHandler parses the "ContactInfo" line.
+func contactInfoHandler(cfg *Config, args string) error {
+	cfg.Contact = args
+	return nil
+}
diff --git a/torconfig/torrc_test.go b/torconfig/torrc_test.go
@@ -15,6 +15,7 @@ func TestParseTorrcFile(t *testing.T) {
 	expect := &Config{
 		Nickname: "JetpacksPlease",
 		ORPort:   9001,
+		Contact:  "Harm Aarts <XXXX ET XXXX>",
 	}
 
 	assert.Equal(t, expect, cfg)