and we rely on this class to identify quoted messages
- classes_whitelist = %w[js-signatureMarker yahoo_quoted]
+ classes_allowlist = %w[js-signatureMarker yahoo_quoted]
attributes_2_css = %w[width height]
# remove tags with subtree
@@ -56,7 +56,7 @@ satinize html string based on whiltelist
scrubber_wipe = Loofah::Scrubber.new do |node|
# replace tags, keep subtree
- if tags_whitelist.exclude?(node.name)
+ if tags_allowlist.exclude?(node.name)
node.replace node.children.to_s
Loofah::Scrubber::STOP
end
@@ -75,7 +75,7 @@ satinize html string based on whiltelist
classes = node['class'].gsub(%r{\t|\n|\r}, '').split
class_new = ''
classes.each do |local_class|
- next if classes_whitelist.exclude?(local_class.to_s.strip)
+ next if classes_allowlist.exclude?(local_class.to_s.strip)
if class_new != ''
class_new += ' '
@@ -115,9 +115,9 @@ satinize html string based on whiltelist
next if !prop[0]
key = prop[0].strip
- next if css_properties_whitelist.exclude?(node.name)
- next if css_properties_whitelist[node.name].exclude?(key)
- next if css_values_blacklist[node.name]&.include?(local_pear.gsub(%r{[[:space:]]}, '').strip)
+ next if css_properties_allowlist.exclude?(node.name)
+ next if css_properties_allowlist[node.name].exclude?(key)
+ next if css_values_blocklist[node.name]&.include?(local_pear.gsub(%r{[[:space:]]}, '').strip)
style += "#{local_pear};"
end
@@ -137,10 +137,10 @@ satinize html string based on whiltelist
node.delete(attribute_name)
end
- # remove attributes if not whitelisted
+ # remove attributes if not allowlisted
node.each do |attribute, _value|
attribute_name = attribute.downcase
- next if attributes_whitelist[:all].include?(attribute_name) || attributes_whitelist[node.name]&.include?(attribute_name)
+ next if attributes_allowlist[:all].include?(attribute_name) || attributes_allowlist[node.name]&.include?(attribute_name)
node.delete(attribute)
end
diff --git a/lib/ldap/user.rb b/lib/ldap/user.rb
index ecf5220f8..e5db465b6 100644
--- a/lib/ldap/user.rb
+++ b/lib/ldap/user.rb
@@ -6,7 +6,7 @@ class Ldap
class User
include Ldap::FilterLookup
- BLACKLISTED = %i[
+ IGNORED_ATTRIBUTES = %i[
admincount
accountexpires
badpasswordtime
@@ -124,7 +124,7 @@ class Ldap
pre_merge_count = attributes.count
attributes.reverse_merge!(entry.to_h
- .except(*BLACKLISTED)
+ .except(*IGNORED_ATTRIBUTES)
.transform_values(&:first)
.compact)
diff --git a/lib/sessions/event/chat_status_customer.rb b/lib/sessions/event/chat_status_customer.rb
index 89efdeb0e..cb2ba1d80 100644
--- a/lib/sessions/event/chat_status_customer.rb
+++ b/lib/sessions/event/chat_status_customer.rb
@@ -72,7 +72,7 @@ return is sent as message back to peer
end
def blocked_origin?
- return false if current_chat.website_whitelisted?(origin)
+ return false if current_chat.website_allowed?(origin)
send_unavailable
true
diff --git a/spec/db/migrate/issue_2019_fix_double_domain_links_in_trigger_emails_spec.rb b/spec/db/migrate/issue_2019_fix_double_domain_links_in_trigger_emails_spec.rb
index 6d0b15545..397ed4430 100644
--- a/spec/db/migrate/issue_2019_fix_double_domain_links_in_trigger_emails_spec.rb
+++ b/spec/db/migrate/issue_2019_fix_double_domain_links_in_trigger_emails_spec.rb
@@ -8,14 +8,14 @@ RSpec.describe Issue2019FixDoubleDomainLinksInTriggerEmails, type: :db_migration
# rubocop:disable Lint/InterpolationCheck
let(:faulty_link) do
'
' \
- 'View ticket' \
- ''
+ 'View ticket' \
+ ''
end
let(:fixed_link) do
'
' \
- 'View ticket' \
- ''
+ 'View ticket' \
+ ''
end
# rubocop:enable Lint/InterpolationCheck
diff --git a/spec/jobs/trigger_webhook_job/record_payload/base_example.rb b/spec/jobs/trigger_webhook_job/record_payload/base_example.rb
index 3ad730333..d279f8b28 100644
--- a/spec/jobs/trigger_webhook_job/record_payload/base_example.rb
+++ b/spec/jobs/trigger_webhook_job/record_payload/base_example.rb
@@ -2,12 +2,12 @@
RSpec.shared_examples 'TriggerWebhookJob::RecordPayload backend' do |factory|
- describe 'const USER_ATTRIBUTE_BLACKLIST' do
+ describe 'const USER_ATTRIBUTE_FILTER' do
- subject(:blacklist) { described_class.const_get(:USER_ATTRIBUTE_BLACKLIST) }
+ subject(:filter) { described_class.const_get(:USER_ATTRIBUTE_FILTER) }
it 'contains sensitive attributes' do
- expect(blacklist).to include('password')
+ expect(filter).to include('password')
end
end
@@ -26,7 +26,7 @@ RSpec.shared_examples 'TriggerWebhookJob::RecordPayload backend' do |factory|
end
end
- it 'does not contain blacklisted User attributes' do
+ it 'does not contain filtered User attributes' do
expect(generate['created_by']).not_to have_key('password')
end
end
diff --git a/spec/lib/ldap/user_spec.rb b/spec/lib/ldap/user_spec.rb
index 09aac1eb2..fb2ef8174 100644
--- a/spec/lib/ldap/user_spec.rb
+++ b/spec/lib/ldap/user_spec.rb
@@ -131,7 +131,7 @@ RSpec.describe Ldap::User do
# selectable attribute
ldap_entry['mail'] = 'test@example.com'
- # blacklisted attribute
+ # filtered attribute
ldap_entry['lastlogon'] = DateTime.current
allow(mocked_ldap).to receive(:search).and_yield(ldap_entry)
diff --git a/spec/models/chat_spec.rb b/spec/models/chat_spec.rb
index 984d3a5e0..7fa5d2620 100644
--- a/spec/models/chat_spec.rb
+++ b/spec/models/chat_spec.rb
@@ -6,16 +6,16 @@ require 'models/concerns/has_xss_sanitized_note_examples'
RSpec.describe Chat, type: :model do
it_behaves_like 'HasXssSanitizedNote', model_factory: :chat
- describe 'website whitelisting' do
- let(:chat) { create(:chat, whitelisted_websites: 'zammad.org') }
+ describe 'website allowing' do
+ let(:chat) { create(:chat, allowed_websites: 'zammad.org') }
- it 'detects whitelisted website' do
- result = chat.website_whitelisted?('https://www.zammad.org')
+ it 'detects allowed website' do
+ result = chat.website_allowed?('https://www.zammad.org')
expect(result).to be true
end
- it 'detects non-whitelisted website' do
- result = chat.website_whitelisted?('https://www.zammad.com')
+ it 'detects non-allowed website' do
+ result = chat.website_allowed?('https://www.zammad.com')
expect(result).to be false
end
end
diff --git a/spec/requests/ticket_spec.rb b/spec/requests/ticket_spec.rb
index d4aeedced..08d83e18b 100644
--- a/spec/requests/ticket_spec.rb
+++ b/spec/requests/ticket_spec.rb
@@ -2022,7 +2022,7 @@ RSpec.describe 'Ticket', type: :request do
expect(response).to have_http_status(:ok)
expect(json_response).to be_a_kind_of(Hash)
expect(json_response['result']).to eq('failed')
- expect(json_response['message']).to eq('No such master ticket number!')
+ expect(json_response['message']).to eq('No such target ticket number!')
put "/api/v1/ticket_merge/#{ticket3.id}/#{ticket1.number}", params: {}, as: :json
expect(response).to have_http_status(:forbidden)
@@ -2040,7 +2040,7 @@ RSpec.describe 'Ticket', type: :request do
expect(response).to have_http_status(:ok)
expect(json_response).to be_a_kind_of(Hash)
expect(json_response['result']).to eq('success')
- expect(json_response['master_ticket']['id']).to eq(ticket2.id)
+ expect(json_response['target_ticket']['id']).to eq(ticket2.id)
end
it 'does ticket merge - change permission (07.02)' do
@@ -2070,7 +2070,7 @@ RSpec.describe 'Ticket', type: :request do
expect(response).to have_http_status(:ok)
expect(json_response).to be_a_kind_of(Hash)
expect(json_response['result']).to eq('success')
- expect(json_response['master_ticket']['id']).to eq(ticket2.id)
+ expect(json_response['target_ticket']['id']).to eq(ticket2.id)
end
it 'does ticket search sorted (08.01)' do
diff --git a/test/browser/agent_ticket_merge_test.rb b/test/browser/agent_ticket_merge_test.rb
index a4af9d397..181434749 100644
--- a/test/browser/agent_ticket_merge_test.rb
+++ b/test/browser/agent_ticket_merge_test.rb
@@ -62,7 +62,7 @@ class AgentTicketMergeTest < TestCase
modal_ready()
set(
- css: '.modal input[name="master_ticket_number"]',
+ css: '.modal input[name="target_ticket_number"]',
value: ticket1[:number],
)
@@ -116,7 +116,7 @@ class AgentTicketMergeTest < TestCase
modal_ready()
set(
- css: '.modal input[name="master_ticket_number"]',
+ css: '.modal input[name="target_ticket_number"]',
value: ticket3[:number],
)
click( css: '.modal button[type="submit"]' )