Skip to content
Snippets Groups Projects
Commit 51dc2b16 authored by lambadalambda's avatar lambadalambda
Browse files

Merge branch 'feauture/webfinger' into 'develop' 

Feauture/webfinger

See merge request !25
parents e477608b 08bd59e4
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 644 additions and 11 deletions
lib/pleroma/web/ostatus/handlers/note_handler.ex
+ 3
− 2
View file @ 51dc2b16
......@@ -55,8 +55,9 @@ defmodule Pleroma.Web.OStatus.NoteHandler do
end
def get_mentions(entry) do
get_people_mentions(entry)
++ get_collection_mentions(entry)
(get_people_mentions(entry)
++ get_collection_mentions(entry))
|> Enum.filter(&(&1))
end
def make_to_list(actor, mentions) do
......
lib/pleroma/web/twitter_api/twitter_api.ex
+ 5
− 1
View file @ 51dc2b16
......@@ -270,7 +270,11 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
user = User.get_cached_by_ap_id(actor)
# mentioned_users = Repo.all(from user in User, where: user.ap_id in ^activity.data["to"])
mentioned_users = Enum.map(activity.data["to"] || [], fn (ap_id) ->
User.get_cached_by_ap_id(ap_id)
if ap_id do
User.get_cached_by_ap_id(ap_id)
else
nil
end
end)
|> Enum.filter(&(&1))
......
lib/pleroma/web/web_finger/web_finger.ex
+ 22
− 8
View file @ 51dc2b16
......@@ -82,20 +82,34 @@ defmodule Pleroma.Web.WebFinger do
{:ok, data}
end
def finger(account, getter \\ &@httpoison.get/3) do
def get_template_from_xml(body) do
xpath = "//Link[@rel='lrdd' and @type='application/xrd+xml']/@template"
with doc when doc != :error <- XML.parse_document(body),
template when template != nil <- XML.string_from_xpath(xpath, doc) do
{:ok, template}
end
end
def find_lrdd_template(domain) do
with {:ok, %{status_code: status_code, body: body}} <- @httpoison.get("http://#{domain}/.well-known/host-meta", [], follow_redirect: true) do
get_template_from_xml(body)
else
e -> {:error, "Can't find lrdd template: #{inspect(e)}"}
end
end
def finger(account) do
domain = with [_name, domain] <- String.split(account, "@") do
domain
else _e ->
URI.parse(account).host
end
address = webfinger_address(domain)
# try https first
response = with {:ok, result} <- getter.("https:" <> address, ["Accept": "application/xrd+xml"], [params: [resource: account]]) do
{:ok, result}
else _ ->
getter.("http:" <> address, ["Accept": "application/xrd+xml"], [params: [resource: account], follow_redirect: true])
end
{:ok, template} = find_lrdd_template(domain)
address = String.replace(template, "{uri}", URI.encode(account))
response = @httpoison.get(address, ["Accept": "application/xrd+xml"])
with {:ok, %{status_code: status_code, body: body}} when status_code in 200..299 <- response,
doc when doc != :error<- XML.parse_document(body),
......
test/fixtures/httpoison_mock/atarifrosch_feed.xml 0 → 100644
+ 473
− 0
View file @ 51dc2b16
This diff is collapsed.
test/fixtures/httpoison_mock/atarifrosch_webfinger.xml 0 → 100644
+ 18
− 0
View file @ 51dc2b16
<?xml version="1.0" encoding="UTF-8"?>
<XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
<Subject>https://social.stopwatchingus-heidelberg.de/user/18330</Subject>
<Alias>acct:atarifrosch@social.stopwatchingus-heidelberg.de</Alias>
<Alias>https://social.stopwatchingus-heidelberg.de/atarifrosch</Alias>
<Link rel="http://webfinger.net/rel/profile-page" type="text/html" href="https://social.stopwatchingus-heidelberg.de/atarifrosch"/>
<Link rel="http://gmpg.org/xfn/11" type="text/html" href="https://social.stopwatchingus-heidelberg.de/atarifrosch"/>
<Link rel="describedby" type="application/rdf+xml" href="https://social.stopwatchingus-heidelberg.de/atarifrosch/foaf"/>
<Link rel="http://apinamespace.org/atom" type="application/atomsvc+xml" href="https://social.stopwatchingus-heidelberg.de/api/statusnet/app/service/atarifrosch.xml"/>
<Link rel="http://apinamespace.org/twitter" href="https://social.stopwatchingus-heidelberg.de/api/"/>
<Link rel="http://specs.openid.net/auth/2.0/provider" href="https://social.stopwatchingus-heidelberg.de/atarifrosch"/>
<Link rel="http://schemas.google.com/g/2010#updates-from" type="application/atom+xml" href="https://social.stopwatchingus-heidelberg.de/api/statuses/user_timeline/18330.atom"/>
<Link rel="magic-public-key" href="data:application/magic-public-key,RSA.1ZeJGulQfTrrWooBUVcqpeJUMWfIFdCU1lprlUEHOKU6XF1an0bkoFzSXxnc_USbLfkeGo_Y2FBLeB8zQbOem3hHccbDOVAo4UhnMeAhiZIMJvE3X8fsk5KEuORpsSt9UjvygxF8CZFlhd13B4jL2ai-j1nWQPOgU-jAshgQQHk=.AQAB"/>
<Link rel="salmon" href="https://social.stopwatchingus-heidelberg.de/main/salmon/user/18330"/>
<Link rel="http://salmon-protocol.org/ns/salmon-replies" href="https://social.stopwatchingus-heidelberg.de/main/salmon/user/18330"/>
<Link rel="http://salmon-protocol.org/ns/salmon-mention" href="https://social.stopwatchingus-heidelberg.de/main/salmon/user/18330"/>
<Link rel="http://ostatus.org/schema/1.0/subscribe" template="https://social.stopwatchingus-heidelberg.de/main/ostatussub?profile={uri}"/>
</XRD>
test/fixtures/httpoison_mock/eal_sakamoto.xml 0 → 100644
+ 1
− 0
View file @ 51dc2b16
<?xml version="1.0" encoding="UTF-8"?><XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0"><Subject>acct:eal@social.sakamoto.gq</Subject><Alias>https://social.sakamoto.gq/users/eal</Alias><Link href="https://social.sakamoto.gq/users/eal/feed.atom" rel="http://schemas.google.com/g/2010#updates-from" type="application/atom+xml" /><Link href="https://social.sakamoto.gq/users/eal" rel="http://webfinger.net/rel/profile-page" type="text/html" /><Link href="https://social.sakamoto.gq/users/eal/salmon" rel="salmon" /><Link href="data:application/magic-public-key,RSA.z3pF85YOhhv2Zaxv9YQ7rCe1aEhetCMVHtrK63tUVGoGdsblyKnVeJNbFcr6k3y35OpHS3HXIi6GzgihYcTuONLP4eQMHTnLUNAQZi03mjJA4iIq8v_tm8ZkL2mXsQSAbWj6Iq518mHNN7OvCoNt3Xjepl_0kgkc2gsund7m8r-Wu0Fusx6UlUyyAk3PexdDRdSSlVLeskqtP8jtdQDoL70pMyL-VD-Qb9RKFdtgJ-M4OqYP-7FVzCqXN0QIPhFf_kvHSLr-c4Y3Wm0nAKHU9CwXWXz5Xqscpv41KlgnUCOkTXb5eBSt23lNulae5srVzWBiFb6guiCpNzBGa-Sqrw==.AQAB" rel="magic-public-key" /></XRD>
\ No newline at end of file
test/fixtures/httpoison_mock/gs.example.org_host_meta 0 → 100644
+ 9
− 0
View file @ 51dc2b16
<?xml version="1.0" encoding="UTF-8"?>
<XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
<Link rel="lrdd" type="application/jrd+json" template="http://gs.example.org/.well-known/webfinger?resource={uri}"/>
<Link rel="lrdd" type="application/json" template="http://gs.example.org/.well-known/webfinger?resource={uri}"/>
<Link rel="lrdd" type="application/xrd+xml" template="http://gs.example.org/.well-known/webfinger?resource={uri}"/>
<Link rel="http://apinamespace.org/oauth/access_token" href="http://gs.example.org/api/oauth/access_token"/>
<Link rel="http://apinamespace.org/oauth/request_token" href="http://gs.example.org/api/oauth/request_token"/>
<Link rel="http://apinamespace.org/oauth/authorize" href="http://gs.example.org/api/oauth/authorize"/>
</XRD>
test/fixtures/httpoison_mock/https___pawoo.net_users_aqidaqidaqid.xml 0 → 100644
+ 11
− 0
View file @ 51dc2b16
<?xml version="1.0"?>
<XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
<Subject>acct:aqidaqidaqid@pawoo.net</Subject>
<Alias>https://pawoo.net/@aqidaqidaqid</Alias>
<Alias>https://pawoo.net/users/aqidaqidaqid</Alias>
<Link rel="http://webfinger.net/rel/profile-page" type="text/html" href="https://pawoo.net/@aqidaqidaqid"/>
<Link rel="http://schemas.google.com/g/2010#updates-from" type="application/atom+xml" href="https://pawoo.net/users/aqidaqidaqid.atom"/>
<Link rel="salmon" href="https://pawoo.net/api/salmon/24733"/>
<Link rel="magic-public-key" href="data:application/magic-public-key,RSA.mRLlTE_m1_HAm9GKPPtfKqQuTJzdDg3k1D8_MVfGHrw14KFr3QFYieV0DmXSCBWcrNcFrnw1ItFdkd7hh-cvhrBAER2MAR_YNDlGQh5RDriBidCa-FvMAYX0f5aDyy33D392OoFxre-esc54VRvCm0JSWLUpm6iNHYc36nHKIJKKW3HbmVfAWp5N-R8kP0IyB5xBWAqBPZA8pnjeXd_jygRfAxfXU7PaXkNeY3xPBpkEujJXGuUjlmz6FcZYlPfhqtNTPsiyE-ZN1u7OdFZ5TOM7zy6Wzs5xa2xhEGv-RrdPZa2OAiYT-xWPLlQsGu5YEO_fAuz3HQx4iOriVb6ndQ==.AQAB"/>
<Link rel="http://ostatus.org/schema/1.0/subscribe" template="https://pawoo.net/authorize_follow?acct={uri}"/>
</XRD>
test/fixtures/httpoison_mock/lain_squeet.me_webfinger.xml 0 → 100644
+ 42
− 0
View file @ 51dc2b16
<?xml version="1.0" encoding="UTF-8"?>
<XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
<Subject>lain@squeet.me</Subject>
<Alias>https://squeet.me/profile/lain</Alias>
<Alias>https://squeet.me/profile/lain</Alias>
<Link rel="http://purl.org/macgirvin/dfrn/1.0"
href="https://squeet.me/profile/lain" />
<Link rel="http://schemas.google.com/g/2010#updates-from"
type="application/atom+xml"
href="https://squeet.me/dfrn_poll/lain" />
<Link rel="http://webfinger.net/rel/profile-page"
type="text/html"
href="https://squeet.me/profile/lain" />
<Link rel="http://microformats.org/profile/hcard"
type="text/html"
href="https://squeet.me/hcard/lain" />
<Link rel="http://portablecontacts.net/spec/1.0"
href="https://squeet.me/poco/lain" />
<Link rel="http://webfinger.net/rel/avatar"
type="image/jpeg"
href="https://squeet.me/photo/profile/301.jpg" />
<Link rel="http://joindiaspora.com/seed_location" type="text/html" href="https://squeet.me/" />
<Link rel="http://joindiaspora.com/guid" type="text/html" href="962c3e1016599bd8cede8a9274362922" />
<Link rel="diaspora-public-key" type="RSA" href="LS0tLS1CRUdJTiBSU0EgUFVCTElDIEtFWS0tLS0tCk1JSUNDZ0tDQWdFQTNkM0JPUkdITHJSWXZYNUFGcEhzeTlpQy9wSlVBSHl4dlhYQW04S3RvRkpqTFZZc2N0bS8KclJwTE81OE5rTUZlTTZOQWJMWmROOFArdEdLNFBORWhsSWNqek9DdS82UmxjVGZwWU9yaDdaeWtWNmk1UlVHRApKQ3JJcjJ5OUVURXBFL09zZ25QNVEwVmpJWWwxdVJLNytPeGZHOGVUTjhDVnpnY2pjM205MnM0MjBXS2dKTHA1CmFaVkRESS9OcHYwektlVi9Pb21Fb2N6U1ZuckEzZGZKSkltQ3IxdWpvUEoyOVJzb1dpeCtLMjJWZU5BdVlOYmUKeWdXY3F3cTlZeWRNaDNqUEVNRVZXUzMvRjZuTE9VS084MDAzY2p1V1NxNXhvZkptVnJkMVlCVFFWR0wzOUNXMAorQUFVcEJhMXc0YWcvc1Nya0xsMFk1QUs0akJKcHVpbHFZcXFtRXlVS2NTWElHVlIyNG5UWWdlWExCRDFtcS80CmVnaTc1eUtWbysrRVdYUTlyb0oxblUxVHYvbkRDY0lYSWE4Zi9uNEpMTk8wTG1DR01aWjVjS3dnMFBmVUZkdEoKK3UwL2UrczFyWmk5d0JZb1B5RGhGM1ZPS0Z5REs1b0xUVEJ6ZERlTklYUjdDc004VElSZnkyaU1rSTh4NTRCQgp3TkFrZGV0b3owZXFrZmFyejd2TUdWajB0SWRZZWRmTFpFYk1jSUVWTk1kWXhqUWJnSGZ3aGUxZ2xZS2RLdmNECjhCanpZU1VDR2Q2ZitSR2ZrYXBvaFBqanBSbW1QaHhlZHNlTEVpZkZMQ2JvWTlUSUIrR1V2NXJPTG1iblVsL3IKdE42dzRsRzlqQ2F1a25UYU5LSmVYVlRmRGRBSE9FbFZLdTN2L05taTA2dnlkMzhWS1JlSFc3OENBd0VBQVE9PQotLS0tLUVORCBSU0EgUFVCTElDIEtFWS0tLS0tCg==" />
<Link rel="salmon"
href="https://squeet.me/salmon/lain" />
<Link rel="http://salmon-protocol.org/ns/salmon-replies"
href="https://squeet.me/salmon/lain" />
<Link rel="http://salmon-protocol.org/ns/salmon-mention"
href="https://squeet.me/salmon/lain/mention" />
<Link rel="http://ostatus.org/schema/1.0/subscribe"
template="https://squeet.me/follow?url={uri}" />
<Link rel="magic-public-key"
href="data:application/magic-public-key,RSA.AMwa8FUs2fWEjX0xN7yRQgegQffhBpuKNC6fa5VNSVorFjGZhRrlPMn7TQOeihlc9lBz2OsHlIedbYn2uJ7yCs0.AQAB" />
<Property xmlns:mk="http://salmon-protocol.org/ns/magic-key"
type="http://salmon-protocol.org/ns/magic-key"
mk:key_id="1">RSA.AN3dwTkRhy60WL1-QBaR7MvYgv6SVAB8sb11wJvCraBSYy1WLHLZv60aSzufDZDBXjOjQGy2XTfD_rRiuDzRIZSHI8zgrv-kZXE36WDq4e2cpFeouUVBgyQqyK9svRExKRPzrIJz-UNFYyGJdbkSu_jsXxvHkzfAlc4HI3N5vdrONtFioCS6eWmVQwyPzab9MynlfzqJhKHM0lZ6wN3XySSJgq9bo6DydvUbKFosfittlXjQLmDW3soFnKsKvWMnTId4zxDBFVkt_xepyzlCjvNNN3I7lkqucaHyZla3dWAU0FRi9_QltPgAFKQWtcOGoP7Eq5C5dGOQCuIwSabopamKqphMlCnElyBlUduJ02IHlywQ9Zqv-HoIu-cilaPvhFl0Pa6CdZ1NU7_5wwnCFyGvH_5-CSzTtC5ghjGWeXCsIND31BXbSfrtP3vrNa2YvcAWKD8g4Rd1TihcgyuaC00wc3Q3jSF0ewrDPEyEX8tojJCPMeeAQcDQJHXraM9HqpH2q8-7zBlY9LSHWHnXy2RGzHCBFTTHWMY0G4B38IXtYJWCnSr3A_AY82ElAhnen_kRn5GqaIT446UZpj4cXnbHixInxSwm6GPUyAfhlL-azi5m51Jf67TesOJRvYwmrpJ02jSiXl1U3w3QBzhJVSrt7_zZotOr8nd_FSkXh1u_.AQAB</Property>
</XRD>
test/fixtures/httpoison_mock/macgirvin.com_host_meta 0 → 100644
+ 11
− 0
View file @ 51dc2b16
<?xml version='1.0' encoding='UTF-8'?>
<XRD xmlns='http://docs.oasis-open.org/ns/xri/xrd-1.0'
xmlns:hm='http://host-meta.net/xrd/1.0'>
<hm:Host>macgirvin.com</hm:Host>
<Link rel='lrdd' type="application/xrd+xml" template='https://macgirvin.com/xrd/?uri={uri}' />
<Link rel="http://oexchange.org/spec/0.8/rel/resident-target" type="application/xrd+xml"
href="https://macgirvin.com/oexchange/xrd" />
</XRD>
test/fixtures/httpoison_mock/mamot.fr_host_meta 0 → 100644
+ 4
− 0
View file @ 51dc2b16
<?xml version="1.0"?>
<XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
<Link rel="lrdd" type="application/xrd+xml" template="https://mamot.fr/.well-known/webfinger?resource={uri}"/>
</XRD>
test/fixtures/httpoison_mock/mastodon.social_host_meta 0 → 100644
+ 4
− 0
View file @ 51dc2b16
<?xml version="1.0"?>
<XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
<Link rel="lrdd" type="application/xrd+xml" template="https://mastodon.social/.well-known/webfinger?resource={uri}"/>
</XRD>
test/fixtures/httpoison_mock/mastodon.xyz_host_meta 0 → 100644
+ 4
− 0
View file @ 51dc2b16
<?xml version="1.0"?>
<XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
<Link rel="lrdd" type="application/xrd+xml" template="https://mastodon.xyz/.well-known/webfinger?resource={uri}"/>
</XRD>
test/fixtures/httpoison_mock/pawoo.net_host_meta 0 → 100644
+ 4
− 0
View file @ 51dc2b16
<?xml version="1.0"?>
<XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
<Link rel="lrdd" type="application/xrd+xml" template="https://pawoo.net/.well-known/webfinger?resource={uri}"/>
</XRD>
test/fixtures/httpoison_mock/pleroma.soykaf.com_host_meta 0 → 100644
+ 1
− 0
View file @ 51dc2b16
<?xml version="1.0" encoding="UTF-8"?><XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0"><Link rel="lrdd" template="https://pleroma.soykaf.com/.well-known/webfinger?resource={uri}" type="application/xrd+xml" /></XRD>
\ No newline at end of file
test/fixtures/httpoison_mock/shitposter.club_host_meta 0 → 100644
+ 9
− 0
View file @ 51dc2b16
<?xml version="1.0" encoding="UTF-8"?>
<XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
<Link rel="lrdd" type="application/jrd+json" template="https://shitposter.club/.well-known/webfinger?resource={uri}"/>
<Link rel="lrdd" type="application/json" template="https://shitposter.club/.well-known/webfinger?resource={uri}"/>
<Link rel="lrdd" type="application/xrd+xml" template="https://shitposter.club/.well-known/webfinger?resource={uri}"/>
<Link rel="http://apinamespace.org/oauth/access_token" href="https://shitposter.club/api/oauth/access_token"/>
<Link rel="http://apinamespace.org/oauth/request_token" href="https://shitposter.club/api/oauth/request_token"/>
<Link rel="http://apinamespace.org/oauth/authorize" href="https://shitposter.club/api/oauth/authorize"/>
</XRD>
test/fixtures/httpoison_mock/social.heldscal.la_host_meta 0 → 100644
+ 9
− 0
View file @ 51dc2b16
<?xml version="1.0" encoding="UTF-8"?>
<XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
<Link rel="lrdd" type="application/jrd+json" template="https://social.heldscal.la/.well-known/webfinger?resource={uri}"/>
<Link rel="lrdd" type="application/json" template="https://social.heldscal.la/.well-known/webfinger?resource={uri}"/>
<Link rel="lrdd" type="application/xrd+xml" template="https://social.heldscal.la/.well-known/webfinger?resource={uri}"/>
<Link rel="http://apinamespace.org/oauth/access_token" href="https://social.heldscal.la/api/oauth/access_token"/>
<Link rel="http://apinamespace.org/oauth/request_token" href="https://social.heldscal.la/api/oauth/request_token"/>
<Link rel="http://apinamespace.org/oauth/authorize" href="https://social.heldscal.la/api/oauth/authorize"/>
</XRD>
test/fixtures/httpoison_mock/social.sakamoto.gq_host_meta 0 → 100644
+ 1
− 0
View file @ 51dc2b16
<?xml version="1.0" encoding="UTF-8"?><XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0"><Link rel="lrdd" template="https://social.sakamoto.gq/.well-known/webfinger?resource={uri}" type="application/xrd+xml" /></XRD>
\ No newline at end of file
test/fixtures/httpoison_mock/social.stopwatchingus-heidelberg.de_host_meta 0 → 100644
+ 9
− 0
View file @ 51dc2b16
<?xml version="1.0" encoding="UTF-8"?>
<XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
<Link rel="lrdd" type="application/jrd+json" template="https://social.stopwatchingus-heidelberg.de/.well-known/webfinger?resource={uri}"/>
<Link rel="lrdd" type="application/json" template="https://social.stopwatchingus-heidelberg.de/.well-known/webfinger?resource={uri}"/>
<Link rel="lrdd" type="application/xrd+xml" template="https://social.stopwatchingus-heidelberg.de/.well-known/webfinger?resource={uri}"/>
<Link rel="http://apinamespace.org/oauth/access_token" href="https://social.stopwatchingus-heidelberg.de/api/oauth/access_token"/>
<Link rel="http://apinamespace.org/oauth/request_token" href="https://social.stopwatchingus-heidelberg.de/api/oauth/request_token"/>
<Link rel="http://apinamespace.org/oauth/authorize" href="https://social.stopwatchingus-heidelberg.de/api/oauth/authorize"/>
</XRD>
test/fixtures/httpoison_mock/social.wxcafe.net_host_meta 0 → 100644
+ 4
− 0
View file @ 51dc2b16
<?xml version="1.0"?>
<XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
<Link rel="lrdd" type="application/xrd+xml" template="https://social.wxcafe.net/.well-known/webfinger?resource={uri}"/>
</XRD>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment