Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

This commit is contained in:
Jenkins 2018-02-08 23:17:14 +00:00
commit 5ba2c300d8
9 changed files with 91 additions and 9 deletions

View File

@ -11,7 +11,7 @@ class ActivityPub::InboxesController < Api::BaseController
process_payload process_payload
head 202 head 202
else else
[signature_verification_failure_reason, 401] render plain: signature_verification_failure_reason, status: 401
end end
end end

View File

@ -1,6 +1,8 @@
# frozen_string_literal: true # frozen_string_literal: true
class Api::SalmonController < Api::BaseController class Api::SalmonController < Api::BaseController
include SignatureVerification
before_action :set_account before_action :set_account
respond_to :txt respond_to :txt
@ -9,7 +11,7 @@ class Api::SalmonController < Api::BaseController
process_salmon process_salmon
head 202 head 202
elsif payload.present? elsif payload.present?
[signature_verification_failure_reason, 401] render plain: signature_verification_failure_reason, status: 401
else else
head 400 head 400
end end

View File

@ -4,7 +4,7 @@
# Table name: invites # Table name: invites
# #
# id :integer not null, primary key # id :integer not null, primary key
# user_id :integer # user_id :integer not null
# code :string default(""), not null # code :string default(""), not null
# expires_at :datetime # expires_at :datetime
# max_uses :integer # max_uses :integer

View File

@ -69,7 +69,7 @@ class Notification < ApplicationRecord
class << self class << self
def reload_stale_associations!(cached_items) def reload_stale_associations!(cached_items)
account_ids = cached_items.map(&:from_account_id).uniq account_ids = (cached_items.map(&:from_account_id) + cached_items.map { |item| item.target_status&.account_id }.compact).uniq
return if account_ids.empty? return if account_ids.empty?
@ -77,6 +77,7 @@ class Notification < ApplicationRecord
cached_items.each do |item| cached_items.each do |item|
item.from_account = accounts[item.from_account_id] item.from_account = accounts[item.from_account_id]
item.target_status.account = accounts[item.target_status.account_id] if item.target_status
end end
end end

View File

@ -7,7 +7,7 @@
# data :json # data :json
# created_at :datetime not null # created_at :datetime not null
# updated_at :datetime not null # updated_at :datetime not null
# user_id :integer # user_id :integer not null
# #
class Web::Setting < ApplicationRecord class Web::Setting < ApplicationRecord

View File

@ -0,0 +1,6 @@
class ChangeUserIdNonnullable < ActiveRecord::Migration[5.1]
def change
change_column_null :invites, :user_id, false
change_column_null :web_settings, :user_id, false
end
end

View File

@ -10,7 +10,7 @@
# #
# It's strongly recommended that you check this file into your version control system. # It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 20180204034416) do ActiveRecord::Schema.define(version: 20180206000000) do
# These are extensions that must be enabled in order to support this database # These are extensions that must be enabled in order to support this database
enable_extension "plpgsql" enable_extension "plpgsql"
@ -204,7 +204,7 @@ ActiveRecord::Schema.define(version: 20180204034416) do
end end
create_table "invites", force: :cascade do |t| create_table "invites", force: :cascade do |t|
t.bigint "user_id" t.bigint "user_id", null: false
t.string "code", default: "", null: false t.string "code", default: "", null: false
t.datetime "expires_at" t.datetime "expires_at"
t.integer "max_uses" t.integer "max_uses"
@ -526,7 +526,7 @@ ActiveRecord::Schema.define(version: 20180204034416) do
t.json "data" t.json "data"
t.datetime "created_at", null: false t.datetime "created_at", null: false
t.datetime "updated_at", null: false t.datetime "updated_at", null: false
t.bigint "user_id" t.bigint "user_id", null: false
t.index ["user_id"], name: "index_web_settings_on_user_id", unique: true t.index ["user_id"], name: "index_web_settings_on_user_id", unique: true
end end

View File

@ -40,7 +40,7 @@ RSpec.describe Api::SalmonController, type: :controller do
end end
end end
context 'with invalid post data' do context 'with empty post data' do
before do before do
request.env['RAW_POST_DATA'] = '' request.env['RAW_POST_DATA'] = ''
post :update, params: { id: account.id } post :update, params: { id: account.id }
@ -50,5 +50,19 @@ RSpec.describe Api::SalmonController, type: :controller do
expect(response).to have_http_status(400) expect(response).to have_http_status(400)
end end
end end
context 'with invalid post data' do
before do
service = double(call: false)
allow(VerifySalmonService).to receive(:new).and_return(service)
request.env['RAW_POST_DATA'] = File.read(File.join(Rails.root, 'spec', 'fixtures', 'salmon', 'mention.xml'))
post :update, params: { id: account.id }
end
it 'returns http client error' do
expect(response).to have_http_status(401)
end
end
end end
end end

View File

@ -1,4 +1,63 @@
require 'rails_helper' require 'rails_helper'
RSpec.describe FetchAtomService do RSpec.describe FetchAtomService do
describe '#link_header' do
context 'Link is Array' do
target = FetchAtomService.new
target.instance_variable_set('@response', 'Link' => [
'<http://example.com/>; rel="up"; meta="bar"',
'<http://example.com/foo>; rel="self"',
])
it 'set first link as link_header' do
expect(target.send(:link_header).links[0].href).to eq 'http://example.com/'
end
end
context 'Link is not Array' do
target = FetchAtomService.new
target.instance_variable_set('@response', 'Link' => '<http://example.com/foo>; rel="self", <http://example.com/>; rel = "up"')
it { expect(target.send(:link_header).links[0].href).to eq 'http://example.com/foo' }
end
end
describe '#perform_request' do
let(:url) { 'http://example.com' }
context 'Check method result' do
before do
WebMock.stub_request(:get, url).to_return(status: 200, body: '', headers: {})
@target = FetchAtomService.new
@target.instance_variable_set('@url', url)
end
it 'HTTP::Response instance is returned and set to @response' do
expect(@target.send(:perform_request).status.to_s).to eq '200 OK'
expect(@target.instance_variable_get('@response')).to be_instance_of HTTP::Response
end
end
context 'check passed parameters to Request' do
before do
@target = FetchAtomService.new
@target.instance_variable_set('@url', url)
@target.instance_variable_set('@unsupported_activity', unsupported_activity)
allow(Request).to receive(:new).with(:get, url)
expect(Request).to receive_message_chain(:new, :add_headers).with('Accept' => accept)
allow(Request).to receive_message_chain(:new, :add_headers, :perform).with(no_args)
end
context '@unsupported_activity is true' do
let(:unsupported_activity) { true }
let(:accept) { 'text/html' }
it { @target.send(:perform_request) }
end
context '@unsupported_activity is false' do
let(:unsupported_activity) { false }
let(:accept) { 'application/activity+json, application/ld+json, application/atom+xml, text/html' }
it { @target.send(:perform_request) }
end
end
end
end end