<%- @T('Email Outbound') %>
diff --git a/app/controllers/channels_controller.rb b/app/controllers/channels_controller.rb
index 961f005e1..8ca9c46fa 100644
--- a/app/controllers/channels_controller.rb
+++ b/app/controllers/channels_controller.rb
@@ -5,10 +5,11 @@ class ChannelsController < ApplicationController
=begin
-Format:
-JSON
+Resource:
+GET /api/v1/channels/#{id}.json
+
+Response example 1:
-Example:
{
"id":1,
"area":"Email::Account",
@@ -38,6 +39,8 @@ Example:
"created_by_id":2,
}
+Response example 2:
+
{
"id":1,
"area":"Twitter::Account",
@@ -84,49 +87,6 @@ Example:
"created_by_id":2,
}
-=end
-
-=begin
-
-Resource:
-GET /api/v1/channels.json
-
-Response:
-[
- {
- "id": 1,
- "area":"Email::Account",
- ...
- },
- {
- "id": 2,
- "area":"Email::Account",
- ...
- }
-]
-
-Test:
-curl http://localhost/api/v1/channels.json -v -u #{login}:#{password}
-
-=end
-
- def index
- return if deny_if_not_role(Z_ROLENAME_ADMIN)
- model_index_render(Channel, params)
- end
-
-=begin
-
-Resource:
-GET /api/v1/channels/#{id}.json
-
-Response:
-{
- "id": 1,
- "area":"Email::Account",
- ...
-}
-
Test:
curl http://localhost/api/v1/channels/#{id}.json -v -u #{login}:#{password}
@@ -134,6 +94,7 @@ curl http://localhost/api/v1/channels/#{id}.json -v -u #{login}:#{password}
def show
return if deny_if_not_role(Z_ROLENAME_ADMIN)
+ return if !check_access
model_show_render(Channel, params)
end
@@ -230,6 +191,7 @@ curl http://localhost/api/v1/channels.json -v -u #{login}:#{password} -H "Conten
def update
return if deny_if_not_role(Z_ROLENAME_ADMIN)
+ return if !check_access
model_update_render(Channel, params)
end
@@ -248,6 +210,7 @@ curl http://localhost/api/v1/channels.json -v -u #{login}:#{password} -H "Conten
def destroy
return if deny_if_not_role(Z_ROLENAME_ADMIN)
+ return if !check_access
model_destory_render(Channel, params)
end
@@ -256,9 +219,11 @@ curl http://localhost/api/v1/channels.json -v -u #{login}:#{password} -H "Conten
assets = {}
Channel.all.each {|channel|
+ next if channel.preferences && channel.preferences[:online_service_disable]
assets = channel.assets(assets)
}
EmailAddress.all.each {|email_address|
+ next if email_address.preferences && email_address.preferences[:online_service_disable]
assets = email_address.assets(assets)
}
render json: {
@@ -290,6 +255,9 @@ curl http://localhost/api/v1/channels.json -v -u #{login}:#{password} -H "Conten
# check admin permissions
return if deny_if_not_role(Z_ROLENAME_ADMIN)
+ # verify access
+ return if !check_access(params[:channel_id]) if params[:channel_id]
+
# connection test
render json: EmailHelper::Probe.outbound(params, params[:email])
end
@@ -299,6 +267,9 @@ curl http://localhost/api/v1/channels.json -v -u #{login}:#{password} -H "Conten
# check admin permissions
return if deny_if_not_role(Z_ROLENAME_ADMIN)
+ # verify access
+ return if !check_access(params[:channel_id]) if params[:channel_id]
+
# connection test
result = EmailHelper::Probe.inbound(params)
@@ -317,6 +288,9 @@ curl http://localhost/api/v1/channels.json -v -u #{login}:#{password} -H "Conten
email = email.downcase
channel_id = params[:channel_id]
+ # verify access
+ return if !check_access(channel_id) if channel_id
+
# check account duplicate
return if email_account_duplicate?({ setting: { inbound: params[:inbound] } }, channel_id)
@@ -359,6 +333,10 @@ curl http://localhost/api/v1/channels.json -v -u #{login}:#{password} -H "Conten
inbound: params[:inbound],
outbound: params[:outbound],
},
+ last_log_in: nil,
+ last_log_out: nil,
+ status_in: 'ok',
+ status_out: 'ok',
active: true,
group_id: Group.first.id,
)
@@ -394,6 +372,8 @@ curl http://localhost/api/v1/channels.json -v -u #{login}:#{password} -H "Conten
def email_notification
+ return if !check_online_service
+
# check admin permissions
return if deny_if_not_role(Z_ROLENAME_ADMIN)
@@ -455,4 +435,23 @@ curl http://localhost/api/v1/channels.json -v -u #{login}:#{password} -H "Conten
}
false
end
+
+ def check_online_service
+ return true if !Setting.get('system_online_service')
+ response_access_deny
+ false
+ end
+
+ def check_access(id = nil)
+ if !id
+ id = params[:id]
+ end
+ return true if !Setting.get('system_online_service')
+
+ channel = Channel.find(id)
+ return true if channel.preferences && !channel.preferences[:online_service_disable]
+
+ response_access_deny
+ false
+ end
end
diff --git a/app/controllers/settings_controller.rb b/app/controllers/settings_controller.rb
index 808453219..5d0aa802f 100644
--- a/app/controllers/settings_controller.rb
+++ b/app/controllers/settings_controller.rb
@@ -91,6 +91,7 @@ class SettingsController < ApplicationController
# DELETE /settings/1
def destroy
return if deny_if_not_role(Z_ROLENAME_ADMIN)
+ return if !check_access
model_destory_render(Setting, params)
end
diff --git a/app/models/channel.rb b/app/models/channel.rb
index ed41bf220..46d10b1dc 100644
--- a/app/models/channel.rb
+++ b/app/models/channel.rb
@@ -2,6 +2,7 @@
class Channel < ApplicationModel
store :options
+ store :preferences
after_create :email_address_check
after_update :email_address_check
diff --git a/config/routes/channel.rb b/config/routes/channel.rb
index 6c3c1f610..8f0612d00 100644
--- a/config/routes/channel.rb
+++ b/config/routes/channel.rb
@@ -10,7 +10,6 @@ Zammad::Application.routes.draw do
match api_path + '/channels/email_notification', to: 'channels#email_notification', via: :post
# channels
- match api_path + '/channels', to: 'channels#index', via: :get
match api_path + '/channels/:id', to: 'channels#show', via: :get
match api_path + '/channels', to: 'channels#create', via: :post
match api_path + '/channels/:id', to: 'channels#update', via: :put
diff --git a/db/migrate/20150828000001_add_setting_online_service2.rb b/db/migrate/20150828000001_add_setting_online_service2.rb
new file mode 100644
index 000000000..24c4728bc
--- /dev/null
+++ b/db/migrate/20150828000001_add_setting_online_service2.rb
@@ -0,0 +1,53 @@
+class AddSettingOnlineService2 < ActiveRecord::Migration
+ def up
+
+ # add preferences
+ add_column :channels, :preferences, :string, limit: 2000, null: true
+ Channel.reset_column_information
+ Channel.where(area: 'Email::Notification').each {|channel|
+ channel.preferences[:online_service_disable] = true
+ channel.save
+ }
+ Channel.where(area: 'Email::Account').each {|channel|
+ next if !channel.options
+ next if !channel.options[:options]
+ next if !channel.options[:options][:host]
+ next if channel.options[:options][:host] !~ /zammad/i
+ channel.preferences[:online_service_disable] = true
+ channel.save
+ }
+
+ add_column :email_addresses, :preferences, :string, limit: 2000, null: true
+ EmailAddress.reset_column_information
+ EmailAddress.all.each {|email_address|
+ next if email_address.email !~ /zammad/i
+ email_address.preferences[:online_service_disable] = true
+ email_address.save
+ }
+
+ # return if it's a new setup
+ return if !Setting.find_by(name: 'system_init_done')
+
+ Setting.create_or_update(
+ title: 'Block Notifications',
+ name: 'send_no_auto_response_reg_exp',
+ area: 'Email::Base',
+ description: 'If this regex matches, no notification will be send by the sender.',
+ options: {
+ form: [
+ {
+ display: '',
+ null: false,
+ name: 'send_no_auto_response_reg_exp',
+ tag: 'input',
+ },
+ ],
+ },
+ state: '(MAILER-DAEMON|postmaster|abuse)@.+?\..+?',
+ preferences: { online_service_disable: true },
+ frontend: false
+ )
+
+ end
+
+end
diff --git a/db/seeds.rb b/db/seeds.rb
index f5f5601bd..32c49fa14 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -1160,6 +1160,7 @@ Setting.create_if_not_exists(
],
},
state: '(MAILER-DAEMON|postmaster|abuse)@.+?\..+?',
+ preferences: { online_service_disable: true },
frontend: false
)
diff --git a/lib/email_helper/probe.rb b/lib/email_helper/probe.rb
index 21195de54..754f7e2fb 100644
--- a/lib/email_helper/probe.rb
+++ b/lib/email_helper/probe.rb
@@ -203,17 +203,12 @@ returns on fail
driver_instance.fetch(params[:options], nil, 'check')
rescue => e
- message_human = ''
- translations.each {|key, message|
- if e.message =~ /#{Regexp.escape(key)}/i
- message_human = message
- end
- }
result = {
result: 'invalid',
settings: params,
message: e.message,
- message_human: message_human,
+ message_human: translation(e.message),
+ invalid_field: invalid_field(e.message),
}
return result
end
@@ -335,17 +330,12 @@ returns on fail
return result
}
end
- message_human = ''
- translations.each {|key, message|
- if e.message =~ /#{Regexp.escape(key)}/i
- message_human = message
- end
- }
result = {
result: 'invalid',
settings: params,
message: e.message,
- message_human: message_human,
+ message_human: translation(e.message),
+ invalid_field: invalid_field(e.message),
}
return result
end
@@ -355,6 +345,35 @@ returns on fail
result
end
+ def self.invalid_field(message_backend)
+ invalid_fields.each {|key, fields|
+ return fields if message_backend =~ /#{Regexp.escape(key)}/i
+ }
+ {}
+ end
+
+ def self.invalid_fields
+ {
+ 'authentication failed' => { user: true, password: true},
+ 'Username and Password not accepted' => { user: true, password: true},
+ 'Incorrect username' => { user: true, password: true},
+ 'Lookup failed' => { user: true },
+ 'Invalid credentials' => { user: true, password: true},
+ 'getaddrinfo: nodename nor servname provided, or not known' => { host: true },
+ 'getaddrinfo: Name or service not known' => { host: true },
+ 'No route to host' => { host: true },
+ 'execution expired' => { host: true },
+ 'Connection refused' => { host: true },
+ }
+ end
+
+ def self.translation(message_backend)
+ translations.each {|key, message_human|
+ return message_human if message_backend =~ /#{Regexp.escape(key)}/i
+ }
+ nil
+ end
+
def self.translations
{
'authentication failed' => 'Authentication failed!',
diff --git a/lib/email_helper/verify.rb b/lib/email_helper/verify.rb
index a81cb0b8e..2f87ea78a 100644
--- a/lib/email_helper/verify.rb
+++ b/lib/email_helper/verify.rb
@@ -62,10 +62,14 @@ or
subject = params[:subject]
end
result = EmailHelper::Probe.outbound(params[:outbound], params[:sender], subject)
+ if result[:result] != 'ok'
+ result[:source] = 'outbound'
+ return result
+ end
# looking for verify email
- (1..5).each {
- sleep 10
+ (1..10).each {
+ sleep 5
# fetch mailbox
found = nil
@@ -79,7 +83,10 @@ or
rescue => e
result = {
result: 'invalid',
+ source: 'inbound',
message: e.to_s,
+ message_human: EmailHelper::Probe.translation(e.message),
+ invalid_field: EmailHelper::Probe.invalid_field(e.message),
subject: subject,
}
return result