diaspora_federation 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c09fc18228d8f509ac6ee451d3f86514112cc959
-  data.tar.gz: 7176641baf249258ad914643fb3d0ed07121e481
+  metadata.gz: a6f8165c74d07b264d4640c1c7cb2178683ca2e4
+  data.tar.gz: 816f20ba2c9153d90e842eafad3bb142d92e08cd
 SHA512:
-  metadata.gz: fb127f2108104ba7a3191af13f2620b8f308df88a67671d488a2f61243c4e04cc11e5f5eb1d31fe5ffda66dee7c35f10d8e6ed5edc995e20b966241f537c1517
-  data.tar.gz: 0b8222a2035a70e4b92f2d599ef0d5ab34c7a17a3ad7b811f203f86e956f80c849ddab90a555b911d50db095c8346b6ab185f95b492b3ecf7b999d47c4cbd244
+  metadata.gz: 00875c9f376ab19ff864b186ef930328616b488979cbbc5347392e0fc6560aba9910353606a91ae17a83daaaa870fd977e0ac4fb087604b90f52801f72e649c4
+  data.tar.gz: 244808bf9d7432b323559e65efe2454ff90c31cbb08ea18ad61e63b6908d70e0c59140836f850eb70e8cee2e24586a4c56745f06b47034c2c7281fc72d2868c4

data/lib/diaspora_federation.rb

@@ -77,9 +77,11 @@ module DiasporaFederation
     def validate_config
       configuration_error "server_uri: Missing or invalid" unless @server_uri.respond_to? :host
 
-      configuration_error "certificate_authorities: Not configured" if @certificate_authorities.nil?
-      unless File.file? @certificate_authorities
-        configuration_error "certificate_authorities: File not found: #{@certificate_authorities}"
+      unless defined?(::Rails) && !::Rails.env.production?
+        configuration_error "certificate_authorities: Not configured" if @certificate_authorities.nil?
+        unless File.file? @certificate_authorities
+          configuration_error "certificate_authorities: File not found: #{@certificate_authorities}"
+        end
       end
 
       unless @callbacks.definition_complete?

data/lib/diaspora_federation/discovery/discovery.rb

@@ -18,10 +18,7 @@ module DiasporaFederation
       def fetch_and_save
         logger.info "Fetch data for #{diaspora_id}"
 
-        unless diaspora_id == clean_diaspora_id(webfinger.acct_uri)
-          raise DiscoveryError, "Diaspora ID does not match: Wanted #{diaspora_id} but got" \
-                                " #{clean_diaspora_id(webfinger.acct_uri)}"
-        end
+        validate_diaspora_id
 
         DiasporaFederation.callbacks.trigger(:save_person_after_webfinger, person)
         logger.info "successfully webfingered #{diaspora_id}"
@@ -30,6 +27,13 @@ module DiasporaFederation
 
       private
 
+      def validate_diaspora_id
+        # validates if the diaspora ID matches the diaspora ID in the webfinger response
+        return if diaspora_id == clean_diaspora_id(webfinger.acct_uri)
+        raise DiscoveryError, "Diaspora ID does not match: Wanted #{diaspora_id} but got" \
+                              " #{clean_diaspora_id(webfinger.acct_uri)}"
+      end
+
       def clean_diaspora_id(diaspora_id)
         diaspora_id.strip.sub("acct:", "").to_s.downcase
       end

data/lib/diaspora_federation/version.rb

@@ -1,4 +1,4 @@
 module DiasporaFederation
   # the gem version
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diaspora_federation
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Benjamin Neff