keine E-Mail fuer neues Paket, Passwort 17 Zeichen

Peter Hormanns

2012-06-25 88dff73e4a4433a0dc2aea6ccc619e25708137ea

keine E-Mail fuer neues Paket, Passwort 17 Zeichen

 hsarback/src/de/hsadmin/core/util/PasswordTool.java

@@ -18,7 +18,7 @@
    }
    
    public static String generatePassword() {
        String password = PwGenerator.generatePassword(7, flagBuilder.build(), 100, random);
        String password = PwGenerator.generatePassword(17, flagBuilder.build(), 100, random);
        return password;
    }


 hsarback/src/de/hsadmin/mods/pac/PacProcessorFactory.java

@@ -11,7 +11,7 @@
import de.hsadmin.core.model.AbstractEntity;
import de.hsadmin.core.qserv.CompoundProcessor;
import de.hsadmin.core.qserv.EntityProcessorFactory;
import de.hsadmin.core.qserv.MailerProcessor;
//import de.hsadmin.core.qserv.MailerProcessor;
import de.hsadmin.core.qserv.Processor;
import de.hsadmin.core.qserv.ProcessorException;
import de.hsadmin.core.qserv.ShellProcessor;
@@ -28,13 +28,13 @@
            EntityManager em, T entity) throws ProcessorException {
        Pac pac = (Pac) entity;
        String pacName = pac.getName();
        String customerEMail = pac.getCustomer().getContractualContact().getEmail();
//        String customerEMail = pac.getCustomer().getContractualContact().getEmail();
        Hive hive = pac.getHive();
        UnixUser unixUser = getPacAdminUser(pac);
        String password = PasswordTool.generatePassword();
        Map<String, String> hiveValues = fillHiveValues(hive);
        List<Map<String, String>> pacValuesList = fillPacValuesList(hive, null);
        Map<String, String> emailVars = fillEMailValues(pacName, customerEMail, password);
//        Map<String, String> emailVars = fillEMailValues(pacName, customerEMail, password);
        Processor priProcessor = new CompoundProcessor(
                createAddUserProc(pacName, unixUser, password), 
                createSetQuotaProc(pac),
@@ -46,7 +46,7 @@
                createMakePacDirectoryStructure(unixUser),
                createIfUp(pacName));
        WaitingTasksProcessor secProcessor = new WaitingTasksProcessor(priProcessor);
        secProcessor.appendProcessor(pac.getHiveName(), createSendEMailProc(pacName, customerEMail, emailVars), "send email to customer");
//        secProcessor.appendProcessor(pac.getHiveName(), createSendEMailProc(pacName, customerEMail, emailVars), "send email to customer");
        return secProcessor;
    }

@@ -151,15 +151,15 @@
                );
    }

    private Processor createSendEMailProc(String pacName,
            String customerEMail, Map<String, String> emailVars) throws ProcessorException {
        return new MailerProcessor(
                        customerEMail, 
                        "Zugangsdaten des neue Hostsharing Pakets " + pacName,
                        "/de/hsadmin/mods/pac/email_new_pac_account.jtpl",
                        emailVars
            );
    }
//    private Processor createSendEMailProc(String pacName,
//            String customerEMail, Map<String, String> emailVars) throws ProcessorException {
//        return new MailerProcessor(
//                        customerEMail, 
//                        "Zugangsdaten des neue Hostsharing Pakets " + pacName,
//                        "/de/hsadmin/mods/pac/email_new_pac_account.jtpl",
//                        emailVars
//            );
//    }

    private Processor createIfUp(String pacName) {
        return new ShellProcessor("ifup eth0:" + pacName);
@@ -207,13 +207,13 @@
        return pacValuesList;
    }

    private Map<String, String> fillEMailValues(String pacName,
            String customerEMail, String password) {
        Map<String, String> emailVars = new HashMap<String, String>();
        emailVars.put("PAC", pacName);
        emailVars.put("PASSWORD", password);
        emailVars.put("CUST_EMAIL", customerEMail);
        return emailVars;
    }
//    private Map<String, String> fillEMailValues(String pacName,
//            String customerEMail, String password) {
//        Map<String, String> emailVars = new HashMap<String, String>();
//        emailVars.put("PAC", pacName);
//        emailVars.put("PASSWORD", password);
//        emailVars.put("CUST_EMAIL", customerEMail);
//        return emailVars;
//    }

}