diaspora_federation 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4fb70171e9f0da5caca67a60e3e2a7a8533d4103
-  data.tar.gz: 14afcd1f7fd459b80be5d5c67ca50f1ed305ac68
+  metadata.gz: 0143fd95b478d62bc2fb26b136df5103c0074fce
+  data.tar.gz: 919d5d547e686a4994305c8a42514762072784be
 SHA512:
-  metadata.gz: 56d87b03ae620f4511ed66f36db940ab0e96dde88aa666ee81163a3809471235c93ef999d6292f47037a482d544a5eda2a5146dd40fafcaaf7542a3ea10fad25
-  data.tar.gz: 38697f0098416ee7baea799dc87216e7059808101e8c0f5b79027c037ecadf2ec56e726553d70668533696d5c47a8b0030b80581caef44560a2a99d1de88f9a1
+  metadata.gz: 40f7824b9fa501dee9fe1683ec5ab33ee22e6da144d5a55d278252c4f365893ee9478ff97e9113ada59d9fb722ddb69fa35eaf63abdfc247200de63e05ba4418
+  data.tar.gz: fb88dd79852c1bb5ff77260165bdaca7ae10745205cd1baa2719033b43b7f8cba97ede1136e323e7f9e3c30121d08a32ee6065f71495759549e7c872acf96457

data/Changelog.md

@@ -1,3 +1,37 @@
+# 0.2.0
+
+## Features
+
+* Add JSON support to entities [#52](https://github.com/diaspora/diaspora_federation/pull/52)
+* Add `AccountMigration` entity [#54](https://github.com/diaspora/diaspora_federation/pull/54)
+* Add `public` flag to `Profile` entity [#59](https://github.com/diaspora/diaspora_federation/pull/59)
+* Allow to generate WebFinger with additional data [#61](https://github.com/diaspora/diaspora_federation/pull/61) [1b9dfc8](https://github.com/diaspora/diaspora_federation/commit/1b9dfc812e8b63c64a2d98db8999cae21d102c87)
+* Provide RFC 7033 WebFinger [#63](https://github.com/diaspora/diaspora_federation/pull/63)
+* Validate the author of the root post for a reshare [92ce4ea](https://github.com/diaspora/diaspora_federation/commit/92ce4eacf842f7a2fa74f298407062a4e0c891a3)
+
+## Refactor
+
+* Replace `factory_girl` with `fabrication` [184954e](https://github.com/diaspora/diaspora_federation/commit/184954e09ce72242cb7ec06c15fed0ad7b6c57c6)
+* Use `actionpack` as dependency instead of `rails` (for `diaspora_federation-rails`) [f860a62](https://github.com/diaspora/diaspora_federation/commit/f860a62382999dcf0adaf41a24b50b74611f6ed9)
+* Remove old backward-compatibility from WebFinger [#60](https://github.com/diaspora/diaspora_federation/pull/60)
+* Make optional properties optional when generating WebFinger [#61](https://github.com/diaspora/diaspora_federation/pull/61) [5fef763](https://github.com/diaspora/diaspora_federation/commit/5fef7633c3aaf47db2592749e506f40b581c0371)
+* Make `Message` entity non-relayable (see [#36](https://github.com/diaspora/diaspora_federation/issues/36)) [#62](https://github.com/diaspora/diaspora_federation/pull/62) [b7167b9](https://github.com/diaspora/diaspora_federation/commit/b7167b9fde4d614fb8f7510720918e029d3624f4)
+* Make `Participation` entity non-relayable (see [#35](https://github.com/diaspora/diaspora_federation/issues/35)) [#62](https://github.com/diaspora/diaspora_federation/pull/62) [41ebe13](https://github.com/diaspora/diaspora_federation/commit/41ebe13126a28b95dbe5acc5db3939ee9dae7e4b)
+* Remove legacy signature order and order by property order in entity (see [#26](https://github.com/diaspora/diaspora_federation/issues/26)) [#62](https://github.com/diaspora/diaspora_federation/pull/62) [87033e4](https://github.com/diaspora/diaspora_federation/commit/87033e4cd63f7d237b9d02d95b739e971d205ea1)
+* Send new property names in XML (see [#29](https://github.com/diaspora/diaspora_federation/issues/29)) [#62](https://github.com/diaspora/diaspora_federation/pull/62) [52a8c89](https://github.com/diaspora/diaspora_federation/commit/52a8c89d4c0f1f66b188ab4a2ac36ffafb0bfa1a)
+* Send unwrapped entities (see [#28](https://github.com/diaspora/diaspora_federation/issues/28)) [#62](https://github.com/diaspora/diaspora_federation/pull/62) [221d87d](https://github.com/diaspora/diaspora_federation/commit/221d87d7fe664bde8718182178cb31ba532977c6)
+* Send the raw magic envelope and new encrypted magic envelope with crypt-json-wrapper (see [#30](https://github.com/diaspora/diaspora_federation/issues/30)) [#62](https://github.com/diaspora/diaspora_federation/pull/62) [1f99518](https://github.com/diaspora/diaspora_federation/commit/1f99518706e6bef3dca51453bf571373cd389942) [e5b2ef7](https://github.com/diaspora/diaspora_federation/commit/e5b2ef71e8cfa299874e3f80175526b8999839f7)
+* Remove sign-code and prevent creation of `SignedRetraction` and `RelayableRetraction` (see [#27](https://github.com/diaspora/diaspora_federation/issues/27)) [#62](https://github.com/diaspora/diaspora_federation/pull/62) [cd3a7ab](https://github.com/diaspora/diaspora_federation/commit/cd3a7abf4d778f7e3139bcb73a42a9dc4cbcb835)
+* Rename `xml_order` to `signature_order` on relayables [b510ed8](https://github.com/diaspora/diaspora_federation/commit/b510ed868f12e15fd5c7b91909cc35281efeb10e)
+* Prevent creation of `Request` entity (see [#32](https://github.com/diaspora/diaspora_federation/issues/32)) [#62](https://github.com/diaspora/diaspora_federation/pull/62) [deed1c3](https://github.com/diaspora/diaspora_federation/commit/deed1c3f3ea76658074a4e34f534a12f083e8622)
+* Don't check `parent_author_signature` and don't check the `author_signature` when the author is the parent author for relayables (see [#64](https://github.com/diaspora/diaspora_federation/issues/64)) [#65](https://github.com/diaspora/diaspora_federation/pull/65) [6817579](https://github.com/diaspora/diaspora_federation/commit/681757907204885735bc60b18929938ec2ad04bb) [57edc8b](https://github.com/diaspora/diaspora_federation/commit/57edc8baabcf884b0ac5395266ffe148cff5da1d)
+* Add `created_at` to `Comment` entity [#67](https://github.com/diaspora/diaspora_federation/pull/67)
+* Improve logging when validation fails [c0ea38d](https://github.com/diaspora/diaspora_federation/commit/c0ea38d258ccd76a7499bff0197434d8e42768e8)
+
+## Bug fixes
+
+* Fix issues when used without rails [ed2c2b7](https://github.com/diaspora/diaspora_federation/commit/ed2c2b7f47b91c308321076344459aee839318a8) [b25e229](https://github.com/diaspora/diaspora_federation/commit/b25e2293b0b83bc083bccdbf1523ee691dbb7b2e) [6615233](https://github.com/diaspora/diaspora_federation/commit/66152337f2b47c1cf6639646f55d21f69fe99708)
+
 # 0.1.9
 
 ## Bug fixes

data/lib/diaspora_federation/discovery/discovery.rb

@@ -74,10 +74,10 @@ module DiasporaFederation
 
       def person
         @person ||= Entities::Person.new(
-          guid:         hcard.guid || webfinger.guid,
+          guid:         hcard.guid,
           diaspora_id:  diaspora_id,
           url:          webfinger.seed_url,
-          exported_key: hcard.public_key || webfinger.public_key,
+          exported_key: hcard.public_key,
           profile:      profile
         )
       end

data/lib/diaspora_federation/discovery/h_card.rb

@@ -160,15 +160,14 @@ module DiasporaFederation
         doc = parse_html_and_validate(html_string)
 
         new(
-          guid:             guid_from_doc(doc),
+          guid:             content_from_doc(doc, :uid),
           nickname:         content_from_doc(doc, :nickname),
           full_name:        content_from_doc(doc, :fn),
           photo_large_url:  photo_from_doc(doc, :photo),
           photo_medium_url: photo_from_doc(doc, :photo_medium),
           photo_small_url:  photo_from_doc(doc, :photo_small),
           searchable:       (content_from_doc(doc, :searchable) == "true"),
-          # TODO: public key is new and can be missing
-          public_key:       (content_from_doc(doc, :key) unless element_from_doc(doc, :key).nil?),
+          public_key:       content_from_doc(doc, :key),
 
           # TODO: remove first_name and last_name!
           first_name:       content_from_doc(doc, :given_name),
@@ -276,13 +275,6 @@ module DiasporaFederation
       private_class_method def self.photo_from_doc(doc, photo_selector)
         element_from_doc(doc, photo_selector)["src"]
       end
-
-      # @deprecated hack for old hcard
-      # @todo remove this when all pods have the new generator
-      private_class_method def self.guid_from_doc(doc)
-        uid_element = element_from_doc(doc, :uid)
-        uid_element.content unless uid_element[:class].include? "nickname"
-      end
     end
   end
 end

data/lib/diaspora_federation/discovery/host_meta.rb

@@ -26,7 +26,7 @@ module DiasporaFederation
       end
 
       # URL fragment to append to the base URL
-      WEBFINGER_SUFFIX = "/webfinger?q={uri}".freeze
+      WEBFINGER_SUFFIX = "/.well-known/webfinger.xml?resource={uri}".freeze
 
       # Returns the WebFinger URL that was used to build this instance (either from
       # xml or by giving a base URL).

data/lib/diaspora_federation/discovery/web_finger.rb

@@ -9,14 +9,11 @@ module DiasporaFederation
     # @example Creating a WebFinger document from a person hash
     #   wf = WebFinger.new(
     #     acct_uri:    "acct:user@server.example",
-    #     alias_url:   "https://server.example/people/0123456789abcdef",
     #     hcard_url:   "https://server.example/hcard/users/user",
     #     seed_url:    "https://server.example/",
     #     profile_url: "https://server.example/u/user",
     #     atom_url:    "https://server.example/public/user.atom",
-    #     salmon_url:  "https://server.example/receive/users/0123456789abcdef",
-    #     guid:        "0123456789abcdef",
-    #     public_key:  "-----BEGIN PUBLIC KEY-----\nABCDEF==\n-----END PUBLIC KEY-----"
+    #     salmon_url:  "https://server.example/receive/users/0123456789abcdef"
     #   )
     #   xml_string = wf.to_xml
     #
@@ -37,11 +34,6 @@ module DiasporaFederation
       #   @return [String]
       property :acct_uri, :string
 
-      # @!attribute [r] alias_url
-      #   @note could be nil
-      #   @return [String] link to the users profile
-      property :alias_url, :string
-
       # @!attribute [r] hcard_url
       #   @return [String] link to the +hCard+
       property :hcard_url, :string
@@ -52,7 +44,7 @@ module DiasporaFederation
 
       # @!attribute [r] profile_url
       #   @return [String] link to the users profile
-      property :profile_url, :string
+      property :profile_url, :string, default: nil
 
       # @!attribute [r] atom_url
       #   This atom feed is an Activity Stream of the user's public posts. diaspora*
@@ -63,42 +55,18 @@ module DiasporaFederation
       #   Note that this feed MAY also be made available through the PubSubHubbub
       #   mechanism by supplying a <link rel="hub"> in the atom feed itself.
       #   @return [String] atom feed url
-      property :atom_url, :string
+      property :atom_url, :string, default: nil
 
       # @!attribute [r] salmon_url
       #   @note could be nil
       #   @return [String] salmon endpoint url
       #   @see https://cdn.rawgit.com/salmon-protocol/salmon-protocol/master/draft-panzer-salmon-00.html#SMLR
       #     Panzer draft for Salmon, paragraph 3.3
-      property :salmon_url, :string
+      property :salmon_url, :string, default: nil
 
       # @!attribute [r] subscribe_url
       #   This url is used to find another user on the home-pod of the user in the webfinger.
-      property :subscribe_url, :string
-
-      # @!attribute [r] guid
-      #   @deprecated Either convert these to +Property+ elements or move to the
-      #     +hCard+, which actually has fields for an +UID+ defined in the +vCard+
-      #     specification (will affect older diaspora* installations).
-      #
-      #   @see HCard#guid
-      #   @see Entities::Person#guid
-      #   @return [String] guid
-      property :guid, :string
-
-      # @!attribute [r] public_key
-      #   @deprecated Either convert these to +Property+ elements or move to the
-      #     +hCard+, which actually has fields for an +KEY+ defined in the +vCard+
-      #     specification (will affect older diaspora* installations).
-      #
-      #   @see HCard#public_key
-      #
-      #   When a user is created on the pod, the pod MUST generate a pgp keypair
-      #   for them. This key is used for signing messages. The format is a
-      #   DER-encoded PKCS#1 key beginning with the text
-      #   "-----BEGIN PUBLIC KEY-----" and ending with "-----END PUBLIC KEY-----".
-      #   @return [String] public key
-      property :public_key, :string
+      property :subscribe_url, :string, default: nil
 
       # +hcard_url+ link relation
       REL_HCARD = "http://microformats.org/profile/hcard".freeze
@@ -106,12 +74,6 @@ module DiasporaFederation
       # +seed_url+ link relation
       REL_SEED = "http://joindiaspora.com/seed_location".freeze
 
-      # @deprecated This should be a +Property+ or moved to the +hCard+, but +Link+
-      #   is inappropriate according to the specification (will affect older
-      #   diaspora* installations).
-      # +guid+ link relation
-      REL_GUID = "http://joindiaspora.com/guid".freeze
-
       # +profile_url+ link relation.
       # @note This might just as well be an +Alias+ instead of a +Link+.
       REL_PROFILE = "http://webfinger.net/rel/profile-page".freeze
@@ -125,22 +87,31 @@ module DiasporaFederation
       # +subscribe_url+ link relation
       REL_SUBSCRIBE = "http://ostatus.org/schema/1.0/subscribe".freeze
 
-      # @deprecated This should be a +Property+ or moved to the +hcard+, but +Link+
-      #   is inappropriate according to the specification (will affect older
-      #   diaspora* installations).
-      # +pubkey+ link relation
-      REL_PUBKEY = "diaspora-public-key".freeze
+      # Additional WebFinger data
+      # @return [Hash] additional elements
+      attr_reader :additional_data
+
+      # Initializes a new WebFinger Entity
+      #
+      # @param [Hash] data WebFinger data
+      # @param [Hash] additional_data additional WebFinger data
+      # @option additional_data [Array<String>] :aliases additional aliases
+      # @option additional_data [Hash] :properties properties
+      # @option additional_data [Array<Hash>] :links additional link elements
+      # @see DiasporaFederation::Entity#initialize
+      def initialize(data, additional_data={})
+        @additional_data = additional_data
+        super(data)
+      end
 
       # Creates the XML string from the current WebFinger instance
       # @return [String] XML string
       def to_xml
-        doc = XrdDocument.new
-        doc.subject = @acct_uri
-        doc.aliases << @alias_url
-
-        add_links_to(doc)
+        to_xrd.to_xml
+      end
 
-        doc.to_xml
+      def to_json
+        to_xrd.to_json
       end
 
       # Creates a WebFinger instance from the given XML string
@@ -152,23 +123,16 @@ module DiasporaFederation
 
         links = data[:links]
 
-        # TODO: remove! public key is deprecated in webfinger
-        public_key = parse_link(links, REL_PUBKEY)
-
         new(
           acct_uri:      data[:subject],
-          alias_url:     parse_alias(data[:aliases]),
+
           hcard_url:     parse_link(links, REL_HCARD),
           seed_url:      parse_link(links, REL_SEED),
           profile_url:   parse_link(links, REL_PROFILE),
           atom_url:      parse_link(links, REL_ATOM),
           salmon_url:    parse_link(links, REL_SALMON),
 
-          subscribe_url: parse_link_template(links, REL_SUBSCRIBE),
-
-          # TODO: remove me!  ##########
-          guid:          parse_link(links, REL_GUID),
-          public_key:    (Base64.strict_decode64(public_key) if public_key)
+          subscribe_url: parse_link_template(links, REL_SUBSCRIBE)
         )
       end
 
@@ -191,25 +155,31 @@ module DiasporaFederation
         end
       end
 
+      def to_xrd
+        XrdDocument.new.tap do |xrd|
+          xrd.subject = acct_uri
+          xrd.aliases.concat(additional_data[:aliases]) if additional_data[:aliases]
+          xrd.properties.merge!(additional_data[:properties]) if additional_data[:properties]
+
+          add_links_to(xrd)
+        end
+      end
+
       def add_links_to(doc)
-        doc.links << {rel: REL_HCARD, type: "text/html", href: @hcard_url}
-        doc.links << {rel: REL_SEED, type: "text/html", href: @seed_url}
+        doc.links << {rel: REL_HCARD, type: "text/html", href: hcard_url}
+        doc.links << {rel: REL_SEED, type: "text/html", href: seed_url}
 
-        # TODO: remove me!  ##############
-        doc.links << {rel: REL_GUID, type: "text/html", href: @guid}
-        ##################################
+        add_optional_links_to(doc)
 
-        doc.links << {rel: REL_PROFILE, type: "text/html", href: @profile_url}
-        doc.links << {rel: REL_ATOM, type: "application/atom+xml", href: @atom_url}
-        doc.links << {rel: REL_SALMON, href: @salmon_url}
+        doc.links.concat(additional_data[:links]) if additional_data[:links]
+      end
 
-        doc.links << {rel: REL_SUBSCRIBE, template: @subscribe_url}
+      def add_optional_links_to(doc)
+        doc.links << {rel: REL_PROFILE, type: "text/html", href: profile_url} if profile_url
+        doc.links << {rel: REL_ATOM, type: "application/atom+xml", href: atom_url} if atom_url
+        doc.links << {rel: REL_SALMON, href: salmon_url} if salmon_url
 
-        # TODO: remove me!  ##############
-        doc.links << {rel:  REL_PUBKEY,
-                      type: "RSA",
-                      href: Base64.strict_encode64(@public_key)}
-        ##################################
+        doc.links << {rel: REL_SUBSCRIBE, template: subscribe_url} if subscribe_url
       end
 
       private_class_method def self.find_link(links, rel)
@@ -225,16 +195,6 @@ module DiasporaFederation
         element = find_link(links, rel)
         element ? element[:template] : nil
       end
-
-      # This method is used to parse the alias_url from the XML.
-      # * redmatrix has sometimes no alias, return nil
-      # * old pods had quotes around the alias url, this can be removed later
-      # * friendica has two aliases and the first is with "acct:": return only an URL starting with http (or https)
-      private_class_method def self.parse_alias(aliases)
-        return nil unless aliases
-        # TODO: Old pods had quotes around alias. Remove the +map+ in next line, when all pods use this gem
-        aliases.map {|a| a.gsub(/\A"|"\Z/, "") }.find {|a| a.start_with?("http") }
-      end
     end
   end
 end

data/lib/diaspora_federation/discovery/xrd_document.rb

@@ -32,7 +32,7 @@ module DiasporaFederation
       XMLNS = "http://docs.oasis-open.org/ns/xri/xrd-1.0".freeze
 
       # +Link+ element attributes
-      LINK_ATTRS = %i(rel type href template).freeze
+      LINK_ATTRS = %i[rel type href template].freeze
 
       # format string for datetime (+Expires+ element)
       DATETIME_FORMAT = "%Y-%m-%dT%H:%M:%SZ".freeze
@@ -69,9 +69,9 @@ module DiasporaFederation
       def to_xml
         Nokogiri::XML::Builder.new(encoding: "UTF-8") {|xml|
           xml.XRD("xmlns" => XMLNS) {
-            xml.Expires(@expires.strftime(DATETIME_FORMAT)) if @expires.instance_of?(DateTime)
+            xml.Expires(expires.strftime(DATETIME_FORMAT)) if expires.instance_of?(DateTime)
 
-            xml.Subject(@subject) if !@subject.nil? && !@subject.empty?
+            xml.Subject(subject) if !subject.nil? && !subject.empty?
 
             add_aliases_to(xml)
             add_properties_to(xml)
@@ -80,6 +80,16 @@ module DiasporaFederation
         }.to_xml
       end
 
+      def to_json
+        {
+          subject:    subject,
+          expires:    expires,
+          aliases:    (aliases if aliases.any?),
+          links:      (links if links.any?),
+          properties: (properties if properties.any?)
+        }.reject {|_, v| v.nil? }
+      end
+
       # Parse the XRD document from the given string and create a hash containing
       # the extracted data.
       #
@@ -107,23 +117,26 @@ module DiasporaFederation
 
       private
 
+      attr_reader :expires
+      attr_reader :subject
+
       NS = {xrd: XMLNS}.freeze
 
       def add_aliases_to(xml)
-        @aliases.each do |a|
+        aliases.each do |a|
           next if !a.instance_of?(String) || a.empty?
           xml.Alias(a.to_s)
         end
       end
 
       def add_properties_to(xml)
-        @properties.each do |type, val|
+        properties.each do |type, val|
           xml.Property(val.to_s, type: type)
         end
       end
 
       def add_links_to(xml)
-        @links.each do |l|
+        links.each do |l|
           attrs = {}
           LINK_ATTRS.each do |attr|
             attrs[attr.to_s] = l[attr] if l.key?(attr)
@@ -135,7 +148,7 @@ module DiasporaFederation
       private_class_method def self.parse_xrd_document(xrd_doc)
         raise ArgumentError unless xrd_doc.instance_of?(String)
 
-        doc = Nokogiri::XML::Document.parse(xrd_doc)
+        doc = Nokogiri::XML(xrd_doc)
         raise InvalidDocument, "Not an XRD document" if !doc.root || doc.root.name != "XRD"
         doc
       end

data/lib/diaspora_federation/entities/account_migration.rb

@@ -0,0 +1,74 @@
+module DiasporaFederation
+  module Entities
+    # This entity is sent when a person changes their diaspora* ID (e.g. when a user migration
+    # from one to another pod happens).
+    #
+    # @see Validators::AccountMigrationValidator
+    class AccountMigration < Entity
+      include Signable
+
+      # @!attribute [r] author
+      #   The old diaspora* ID of the person who changes their ID
+      #   @see Person#author
+      #   @return [String] author diaspora* ID
+      property :author, :string
+
+      # @!attribute [r] profile
+      #   Holds new updated profile of a person, including diaspora* ID
+      #   @return [Person] person new data
+      entity :profile, Entities::Profile
+
+      # @!attribute [r] signature
+      #   Signature that validates original and target diaspora* IDs with the new key of person
+      #   @return [String] signature
+      property :signature, :string, default: nil
+
+      # @return [String] string representation of this object
+      def to_s
+        "AccountMigration:#{author}:#{profile.author}"
+      end
+
+      # Shortcut for calling super method with sensible arguments
+      #
+      # @see DiasporaFederation::Entities::Signable#verify_signature
+      def verify_signature
+        super(profile.author, :signature)
+      end
+
+      # Calls super and additionally does signature verification for the instantiated entity.
+      #
+      # @see DiasporaFederation::Entity.from_hash
+      def self.from_hash(*args)
+        super.tap(&:verify_signature)
+      end
+
+      private
+
+      # @see DiasporaFederation::Entities::Signable#signature_data
+      def signature_data
+        to_s
+      end
+
+      def enriched_properties
+        super.tap do |hash|
+          hash[:signature] = signature || sign_with_new_key
+        end
+      end
+
+      # Sign with new user's key
+      # @raise [NewPrivateKeyNotFound] if the new user's private key is not found
+      # @return [String] A Base64 encoded signature of #signature_data with key
+      def sign_with_new_key
+        privkey = DiasporaFederation.callbacks.trigger(:fetch_private_key, profile.author)
+        raise NewPrivateKeyNotFound, "author=#{profile.author} obj=#{self}" if privkey.nil?
+        sign_with_key(privkey).tap do
+          logger.info "event=sign status=complete signature=signature author=#{profile.author} obj=#{self}"
+        end
+      end
+
+      # Raised, if creating the signature fails, because the new private key of a user was not found
+      class NewPrivateKeyNotFound < RuntimeError
+      end
+    end
+  end
+end

data/lib/diaspora_federation/entities/comment.rb

@@ -4,10 +4,6 @@ module DiasporaFederation
     #
     # @see Validators::CommentValidator
     class Comment < Entity
-      # Old signature order
-      # @deprecated
-      LEGACY_SIGNATURE_ORDER = %i(guid parent_guid text author).freeze
-
       # The {Comment} parent is a {Post}
       PARENT_TYPE = "Post".freeze
 

data/lib/diaspora_federation/entities/event_participation.rb

@@ -4,19 +4,11 @@ module DiasporaFederation
     #
     # @see Validators::EventParticipationValidator
     class EventParticipation < Entity
-      # Old signature order
-      # @deprecated
-      LEGACY_SIGNATURE_ORDER = %i(author guid parent_guid status).freeze
-
       # The {EventParticipation} parent is an {Event}
       PARENT_TYPE = "Event".freeze
 
       include Relayable
 
-      # Redefine the author property without +diaspora_handle+ +xml_name+
-      # @deprecated Can be removed after XMLs are generated with new names
-      property :author, :string
-
       # @!attribute [r] status
       #   The participation status of the user
       #   "accepted", "declined" or "tentative"

data/lib/diaspora_federation/entities/like.rb

@@ -4,24 +4,20 @@ module DiasporaFederation
     #
     # @see Validators::LikeValidator
     class Like < Entity
-      # Old signature order
-      # @deprecated
-      LEGACY_SIGNATURE_ORDER = %i(positive guid parent_type parent_guid author).freeze
-
       include Relayable
 
-      # @!attribute [r] positive
-      #   If +true+ set a like, if +false+, set a dislike (dislikes are currently not
-      #   implemented in the diaspora* frontend).
-      #   @return [Boolean] is it a like or a dislike
-      property :positive, :boolean
-
       # @!attribute [r] parent_type
       #   A string describing the type of the parent
       #   Can be "Post" or "Comment" (Comments are currently not implemented in the
       #   diaspora* frontend).
       #   @return [String] parent type
       property :parent_type, :string, xml_name: :target_type
+
+      # @!attribute [r] positive
+      #   If +true+ set a like, if +false+, set a dislike (dislikes are currently not
+      #   implemented in the diaspora* frontend).
+      #   @return [Boolean] is it a like or a dislike
+      property :positive, :boolean
     end
   end
 end

data/lib/diaspora_federation/entities/message.rb

@@ -4,11 +4,17 @@ module DiasporaFederation
     #
     # @see Validators::MessageValidator
     class Message < Entity
-      # Old signature order
-      # @deprecated
-      LEGACY_SIGNATURE_ORDER = %i(guid parent_guid text created_at author conversation_guid).freeze
-
-      include Relayable
+      # @!attribute [r] author
+      #   The diaspora* ID of the author
+      #   @see Person#author
+      #   @return [String] diaspora* ID
+      property :author, :string, xml_name: :diaspora_handle
+
+      # @!attribute [r] guid
+      #   A random string of at least 16 chars
+      #   @see Validation::Rule::Guid
+      #   @return [String] guid
+      property :guid, :string
 
       # @!attribute [r] text
       #   Text of the message composed by a user
@@ -26,50 +32,9 @@ module DiasporaFederation
       #   @return [String] conversation guid
       property :conversation_guid, :string
 
-      # It is only valid to receive a {Message} from the author itself,
-      # or from the author of the parent {Conversation} if the author signature is valid.
-      # @deprecated remove after {Message} doesn't include {Relayable} anymore
-      def sender_valid?(sender)
-        sender == author || (sender == parent_author && verify_author_signature)
-      end
-
-      # @deprecated remove after {Message} doesn't include {Relayable} anymore
-      def to_h
-        super.tap {|hash| hash[:created_at] = created_at.utc.iso8601 }
-      end
-
-      private
-
-      # @deprecated remove after {Message} doesn't include {Relayable} anymore
-      def verify_author_signature
-        verify_signature(author, :author_signature)
-        true
-      end
-
-      # @deprecated remove after {Message} doesn't include {Relayable} anymore
-      def parent_author
-        parent = DiasporaFederation.callbacks.trigger(:fetch_related_entity, "Conversation", conversation_guid)
-        raise Federation::Fetcher::NotFetchable, "parent of #{self} not found" unless parent
-        parent.author
-      end
-
-      # old timestamp format, because this signature is only used from old pods which also relay with old format
-      # @deprecated remove after {Message} doesn't include {Relayable} anymore
-      def normalize_property(name, value)
-        if name == :created_at
-          value.to_s
-        else
-          super
-        end
-      end
-
-      # Default implementation, don't verify signatures for a {Message}.
-      # @see Entity.populate_entity
-      # @deprecated remove after {Message} doesn't include {Relayable} anymore
-      # @param [Nokogiri::XML::Element] root_node xml nodes
-      # @return [Entity] instance
-      private_class_method def self.populate_entity(root_node)
-        new({parent_guid: nil, parent: nil}.merge(entity_data(root_node)))
+      # @return [String] string representation of this object
+      def to_s
+        "#{super}:#{conversation_guid}"
       end
     end
   end