Maybe fixed: update relay_recipients when email address is created or deleted.

Michael Hierweck

2017-09-08 c7fbfcc85ce953c398cafc5d3d7df13ccc997e5e

Maybe fixed: update relay_recipients when email address is created or deleted.

 hsarback/src/de/hsadmin/mods/email/EMailAddressProcessorFactory.java

@@ -22,11 +22,11 @@
        Pac pac = email.getDomain().getUser().getPac();
        CompoundProcessor cp = new CompoundProcessor();
        cp.appendProcessor(new ShellProcessor( "postmap -r -i /etc/postfix-mailin/virtual",
                email.getFullDomain() + " -" ) );
        WaitingTasksProcessor waitingTasksProcessor = new WaitingTasksProcessor(cp);
                email.getFullDomain() + " -" ) );		
        Config config = Config.getInstance();
        cp.appendProcessor(new ShellProcessor( "postmap -r -i /etc/postfix-mailin/virtual",
                email.getEMailAddress() + " " + email.getTarget() ) );
        WaitingTasksProcessor waitingTasksProcessor = new WaitingTasksProcessor(cp);
        for (String queueName : config.getProperty("queues.mail").split(",")) {
            waitingTasksProcessor.appendProcessor(queueName, new ShellProcessor( "postmap -r -i /etc/postfix-mailin/relayrecipients",
                    email.getEMailAddress() + " anything" ), "Add to relayrecipients" );
@@ -35,11 +35,9 @@
            String domName = email.getDomain().getName();            
            for (String queueName : config.getProperty("queues.mail").split(",")) {
                waitingTasksProcessor.appendProcessor(queueName, createMailinSetupProcessor(domName, pac), queueName + ".hostsharing.net");
            }
            return waitingTasksProcessor;
        } else {
            return cp;
            }		
        }
        return waitingTasksProcessor;
    }
    
    public <T extends AbstractEntity> Processor createUpdateProcessor(EntityManager em, T entity) {
@@ -60,8 +58,7 @@
                new ShellProcessor( "postmap -d '" + email.getEMailAddress() + "' /etc/postfix-mailin/relayrecipients" ), 
                    "Remove from relayrecipients" );
        }        
        int emailAddressCount = emailAddressCount(em, email);
        if (emailAddressCount == 0) {
        if (emailAddressCount(em, email) == 0) {
            // remove the domain from virtual.db
            String fullDomain = email.getFullDomain();
            cp.appendProcessor( 
@@ -69,10 +66,8 @@
            for (String queueName : config.getProperty("queues.mail").split(",")) {
                waitingTasksProcessor.appendProcessor(queueName, createMailinDeleteProcessor(fullDomain), queueName + ".hostsharing.net");
            }
            return waitingTasksProcessor;
        } else {
            return cp;
        }
        return waitingTasksProcessor;
    }

    private int emailAddressCount(EntityManager em, EMailAddress email) {