Commit 7799762f authored by A. Täffner's avatar A. Täffner
Browse files

Mail Security: implemented a SendAs-Permission for aliases and forwardings (by dark alex) 

NOTE: I did only translate de and en!
parent b6a0ab05

install/sql/incremental/upd_dev_collection.sql

+13 −0
Original line number Diff line number Diff line
@@ -192,3 +192,16 @@ ALTER TABLE `web_domain` ADD `ssl_letsencrypt` enum('n','y') NOT NULL DEFAULT 'n 


ALTER TABLE `openvz_template` CHANGE `vmguarpages` `vmguarpages` varchar(255) DEFAULT '65536:unlimited';

ALTER TABLE `openvz_template` CHANGE `privvmpages` `privvmpages` varchar(255) DEFAULT '131072:139264';









-- Mail Security: Send As Permission by dark alex

-- MS: alter table

ALTER TABLE `mail_forwarding`

	ADD COLUMN `allow_send_as` ENUM('n','y') NOT NULL DEFAULT 'n' AFTER `active`;

-- MS: apply defaults

update mail_forwarding set allow_send_as='y' WHERE type = 'alias';

install/sql/ispconfig3.sql

+1 −0
Original line number Diff line number Diff line
@@ -800,6 +800,7 @@ CREATE TABLE `mail_forwarding` ( 
  `destination` text,

  `type` enum('alias','aliasdomain','forward','catchall') NOT NULL default 'alias',

  `active` enum('n','y') NOT NULL DEFAULT 'n',

  `allow_send_as` ENUM('n','y') NOT NULL DEFAULT 'n',

  `greylisting` enum('n','y' ) NOT NULL DEFAULT 'n',

  PRIMARY KEY  (`forwarding_id`),

  KEY `server_id` (`server_id`,`source`),

install/tpl/mysql-virtual_sender_login_maps.cf.master

+1 −1
Original line number Diff line number Diff line 
user = {mysql_server_ispconfig_user}

password = {mysql_server_ispconfig_password}

dbname = {mysql_server_database}

query = SELECT destination FROM mail_forwarding WHERE source = '%s' AND active = 'y' AND type = 'alias' AND server_id = {server_id} UNION SELECT email FROM mail_user WHERE email = '%s' AND disablesmtp = 'n' AND server_id = {server_id};

query = SELECT destination FROM mail_forwarding WHERE source = '%s' AND active = 'y' AND allow_send_as = 'y' AND server_id = {server_id} UNION SELECT email FROM mail_user WHERE email = '%s' AND disablesmtp = 'n' AND server_id = {server_id};

hosts = {mysql_server_ip}
 
 No newline at end of file

interface/web/mail/form/mail_alias.tform.php

+6 −0
Original line number Diff line number Diff line
@@ -124,6 +124,12 @@ $form["tabs"]['alias'] = array ( 
			'default' => 'y',

			'value'  => array(0 => 'n', 1 => 'y')

		),

		'allow_send_as' => array (

			'datatype' => 'VARCHAR',

			'formtype' => 'CHECKBOX',

			'default' => 'y',

			'value'  => array(1 => 'y', 0 => 'n')

		),

		'greylisting' => array (

			'datatype' => 'VARCHAR',

			'formtype' => 'CHECKBOX',

interface/web/mail/form/mail_forward.tform.php

+6 −0
Original line number Diff line number Diff line
@@ -118,6 +118,12 @@ $form["tabs"]['forward'] = array ( 
			'default' => 'y',

			'value'  => array(0 => 'n', 1 => 'y')

		),

		'allow_send_as' => array (

			'datatype' => 'VARCHAR',

			'formtype' => 'CHECKBOX',

			'default' => 'n',

			'value'  => array(1 => 'y', 0 => 'n')

		),

		'greylisting' => array (

			'datatype' => 'VARCHAR',

			'formtype' => 'CHECKBOX',