Merge pull request #18 from ganggo/fix_pubkey_friendica

Fix public key retrieval from friendica via hcard

hcard.go

@@ -71,6 +71,10 @@ func (h *Hcard) Fetch(endpoint string) error {
   func(i int, s *goquery.Selection) {
     (*h).PublicKey = s.Find("pre").Text()
   })
+  doc.Find(".key.u-key").Each(
+  func(i int, s *goquery.Selection) {
+    (*h).PublicKey = s.Text()
+  })
   doc.Find(".entity_url").Each(
   func(i int, s *goquery.Selection) {
     (*h).Url = s.Find("a").Text()

hcard_test.go

@@ -23,45 +23,44 @@ import (
 )
 
 func TestHcard(t *testing.T) {
-  var hcard Hcard
-  err := hcard.Fetch(TEST_HCARD_LINK)
-  if err != nil {
-    t.Errorf("Some error occured while parsing: %v", err)
+  // XXX testing on live systems could break stuff
+  // First link is a diaspora production server
+  // Second link is a diaspora development server
+  // Third link is a friendica production server
+  links := []string{
+    "https://joindiaspora.com/hcard/users/db3d5a70c1ee01334cdd5215e5076e52",
+    "https://sechat.org/hcard/users/18ad211f33c65726",
+    "https://pirati.ca/hcard/heluecht",
   }
-
-  matched, err := regexp.MatchString(`^[\w\d]+?$`, hcard.Guid)
-  if err != nil || !matched {
-    t.Errorf("Expected nil and match, got %v and %v", err, matched)
-  }
-
-  nickname := "podmin"
-  if hcard.Nickname != nickname {
-    t.Errorf("Expected to be %s, got %s", nickname, hcard.Nickname)
-  }
-
-  matched, err = regexp.MatchString(`^-----BEGIN.+?KEY-----`, hcard.PublicKey)
-  if err != nil || !matched {
-    t.Errorf("Expected nil and match, got %v and '%s'", err, hcard.PublicKey)
-  }
-
-  url := "https://joindiaspora.com/"
-  if hcard.Url != url {
-    t.Errorf("Expected to be %s, got %s", url, hcard.Url)
-  }
-
-  photo := url + "uploads/images/thumb_"
-  matched, err = regexp.MatchString(photo + `large_[\w\d]+?\.png`, hcard.Photo)
-  if err != nil || !matched {
-    t.Errorf("Expected nil and match, got %v and %s", err, hcard.Photo)
+  for _, link := range links {
+    var hcard Hcard
+    err := hcard.Fetch(link)
+    if err != nil {
+      t.Errorf("Some error occured while parsing: %v", err)
+    }
+    evaluateHcard(hcard, t)
   }
+}
 
-  matched, err = regexp.MatchString(photo + `medium_[\w\d]+?\.png`, hcard.PhotoMedium)
-  if err != nil || !matched {
-    t.Errorf("Expected nil and match, got %v and %s", err, hcard.PhotoMedium)
+func evaluateHcard(hcard Hcard, t *testing.T) {
+  var tests = []struct{
+    Expected string
+    Text string
+  }{
+    {`^[\w\d]+?$`, hcard.Guid},
+    {`^[\w\d]+?$`, hcard.Nickname},
+    {`^-----BEGIN.+?KEY-----`, hcard.PublicKey},
+    {`^[\w\d\.\:\/]+?$`, hcard.Url},
+    {`^http.*\.\w+\?{0,1}.*$`, hcard.Photo},
+    {`^http.*\.\w+\?{0,1}.*$`, hcard.PhotoSmall},
+    {`^http.*\.\w+\?{0,1}.*$`, hcard.PhotoMedium},
   }
 
-  matched, err = regexp.MatchString(photo + `small_[\w\d]+?\.png`, hcard.PhotoSmall)
-  if err != nil || !matched {
-    t.Errorf("Expected nil and match, got %v and %s", err, hcard.PhotoSmall)
+  for i, test := range tests {
+    matched, err := regexp.MatchString(test.Expected, test.Text)
+    if err != nil || !matched {
+      t.Errorf("#%d: Expected to be '%s', got '%s' (%v)",
+        i, test.Expected, test.Text, err)
+    }
   }
 }

helper_test.go

@@ -25,8 +25,6 @@ import (
 
 var TEST_AUTHOR = `diaspora_2nd@localhost:3001`
 
-var TEST_HCARD_LINK = "https://joindiaspora.com/hcard/users/db3d5a70c1ee01334cdd5215e5076e52"
-
 var TEST_PRIV_KEY = []byte(`-----BEGIN PRIVATE KEY-----
 MIIEpAIBAAKCAQEA5qryP/x8Wtht+VLH/TvLNofTF9B4aj78sYlctQxIuzEmuLc3
 nU+EhpeExe9DpJEt6/l5V3NIHymkkNMA7Mu4fWmxdyVMEweY7utTl+wkwdJFFlBV