diff --git a/Gemfile b/Gemfile index 6df2cfe69caeeee6e82295c565323102d01a43b3..66efbfd37b8e0e0e946dcadb74154429071aa03f 100644 --- a/Gemfile +++ b/Gemfile @@ -13,7 +13,7 @@ gem "unicorn-worker-killer", "0.4.4" # Federation -gem "diaspora_federation-rails", "0.1.3" +gem "diaspora_federation-rails", "0.1.4" # API and JSON @@ -287,7 +287,7 @@ group :test do gem "webmock", "2.1.0", require: false gem "shoulda-matchers", "3.1.1" - gem "diaspora_federation-test", "0.1.3" + gem "diaspora_federation-test", "0.1.4" # Coverage gem 'coveralls', require: false diff --git a/Gemfile.lock b/Gemfile.lock index 577595f5628af31a82c07ab1fbff1b725b69a2ed..b8906af729c8f484a948ec3fe0b4e19a02e50b22 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -177,17 +177,17 @@ GEM devise rails (>= 3.0.4) diaspora-prosody-config (0.0.5) - diaspora_federation (0.1.3) + diaspora_federation (0.1.4) faraday (~> 0.9.0) faraday_middleware (~> 0.10.0) nokogiri (~> 1.6, >= 1.6.8) typhoeus (~> 1.0) valid (~> 1.0) - diaspora_federation-rails (0.1.3) - diaspora_federation (= 0.1.3) + diaspora_federation-rails (0.1.4) + diaspora_federation (= 0.1.4) rails (~> 4.2) - diaspora_federation-test (0.1.3) - diaspora_federation (= 0.1.3) + diaspora_federation-test (0.1.4) + diaspora_federation (= 0.1.4) factory_girl (~> 4.7) diff-lcs (1.2.5) docile (1.1.5) @@ -934,8 +934,8 @@ DEPENDENCIES devise-token_authenticatable (= 0.5.2) devise_lastseenable (= 0.0.6) diaspora-prosody-config (= 0.0.5) - diaspora_federation-rails (= 0.1.3) - diaspora_federation-test (= 0.1.3) + diaspora_federation-rails (= 0.1.4) + diaspora_federation-test (= 0.1.4) entypo-rails (= 3.0.0.pre.rc2) eye (= 0.8.1) factory_girl_rails (= 4.7.0) diff --git a/app/workers/receive_base.rb b/app/workers/receive_base.rb index 15c691d6949d13a2bfa1e1522b27e6a0255f1f90..aab2082e409b7b8e790fb2fb27b48c2518aa4c70 100644 --- a/app/workers/receive_base.rb +++ b/app/workers/receive_base.rb @@ -18,6 +18,7 @@ module Workers DiasporaFederation::Salmon::SenderKeyNotFound, DiasporaFederation::Salmon::InvalidEnvelope, DiasporaFederation::Salmon::InvalidSignature, + DiasporaFederation::Salmon::InvalidDataType, DiasporaFederation::Salmon::InvalidAlgorithm, DiasporaFederation::Salmon::InvalidEncoding, Diaspora::Federation::AuthorIgnored,