hostsharing/hs.hsadmin
8
1
Fork 0
Code Pull Requests Activity

Support SSL-Cert per Domain (SNI)

Browse Source
This commit is contained in:
Peter Hormanns 2015-08-07 14:33:33 +02:00
parent bc14a31133
commit 5eef3088cb
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java
View File

@ -256,25 +256,25 @@ public class DomainProcessorFactory implements EntityProcessorFactory {
return domDirsProcessor; return domDirsProcessor;
} }
private Processor createApacheVHostSetupProcessor(EntityManager em, Domain dom) throws ProcessorException { private Processor createApacheVHostSetupProcessor(final EntityManager em, final Domain dom) throws ProcessorException {
Map<String, Object> templateVars = new HashMap<String, Object>(); final Map<String, Object> templateVars = new HashMap<String, Object>();
templateVars.put("dynamicWeb", new Boolean(dom.isDynamic())); templateVars.put("dynamicWeb", new Boolean(dom.isDynamic()));
String domName = dom.getName(); final String domName = dom.getName();
int level = domName.split("\\.").length; int level = domName.split("\\.").length;
String linkPrefix = Integer.toString(100 - level); final String linkPrefix = Integer.toString(100 - level);
String pac = dom.getUser().getPac().getName(); final Query query = em.createQuery("SELECT d FROM Domains d WHERE d.domainoptions.name = :option AND d.name = :domname");
Query query = em.createQuery("SELECT d FROM Domains d WHERE d.domainoptions.name = :option AND d.name = :domname");
query.setParameter("domname", dom.getName()); query.setParameter("domname", dom.getName());
ifOption(templateVars, query, "indexes", "+Indexes", "-Indexes"); ifOption(templateVars, query, "indexes", "+Indexes", "-Indexes");
ifOption(templateVars, query, "includes", "+IncludesNoExec", "-Includes"); ifOption(templateVars, query, "includes", "+IncludesNoExec", "-Includes");
ifOption(templateVars, query, "multiviews", "+MultiViews", "-MultiViews"); ifOption(templateVars, query, "multiviews", "+MultiViews", "-MultiViews");
ifOption(templateVars, query, "htdocsfallback", Boolean.TRUE, Boolean.FALSE); ifOption(templateVars, query, "htdocsfallback", Boolean.TRUE, Boolean.FALSE);
Processor domSetupProcessor = new CompoundProcessor( final Processor domSetupProcessor = new CompoundProcessor(
new ShellProcessor("export PEMS_DIR=/etc/apache2/pems-enabled/" + dom.getUser().getName() + " && "
+ "mkdir -p $PEMS_DIR/ && "
+ "cd $PEMS_DIR && "
+ "echo \"\" > " + domName + ".chain && "
+ "openssl req -x509 -newkey rsa:2048 -keyout " + domName + ".key -out " + domName + ".crt -days 1100 -nodes -subj '/CN=" + domName + "'"),
new CreateFileProcessor("/de/hsadmin/mods/dom/apache-vhost.vm", templateVars, dom, "/etc/apache2/sites-available/" + domName + ".tmp", "root", "root", "644", true), new CreateFileProcessor("/de/hsadmin/mods/dom/apache-vhost.vm", templateVars, dom, "/etc/apache2/sites-available/" + domName + ".tmp", "root", "root", "644", true),
new ShellProcessor("ls /etc/apache2/pems/" + pac + ".pem >/dev/null 2>&1" +
" && sed -i '/SSLCertificate.*default/d' " + "/etc/apache2/sites-available/" + domName + ".tmp" +
" && (ls /etc/apache2/pems/" + pac + ".chain.pem >/dev/null 2>&1 || sed -i '/SSLCertificateChain.*" + pac + "/d' " + "/etc/apache2/sites-available/" + domName + ".tmp )" +
" || sed -i '/SSLCertificate.*" + pac + "/d' " + "/etc/apache2/sites-available/" + domName + ".tmp"),
new ShellProcessor( new ShellProcessor(
" (diff -q /etc/apache2/sites-available/" + domName + ".tmp /etc/apache2/sites-available/" + domName + " && rm /etc/apache2/sites-available/" + domName + ".tmp ) " + " (diff -q /etc/apache2/sites-available/" + domName + ".tmp /etc/apache2/sites-available/" + domName + " && rm /etc/apache2/sites-available/" + domName + ".tmp ) " +
" || (mv /etc/apache2/sites-available/" + domName + ".tmp /etc/apache2/sites-available/" + domName + " || (mv /etc/apache2/sites-available/" + domName + ".tmp /etc/apache2/sites-available/" + domName +

7
hsarback/src/de/hsadmin/mods/dom/apache-vhost.vm
View File

@ -90,10 +90,9 @@
#end #end
SSLEngine On SSLEngine On
SSLCertificateFile /etc/apache2/pems/default.pem SSLCertificateFile /etc/apache2/pems-enabled/${dom.user.name}/${dom.name}.crt
SSLCertificateChainFile /etc/apache2/pems/default.chain.pem SSLCertificateKeyFile /etc/apache2/pems-enabled/${dom.user.name}/${dom.name}.key
SSLCertificateFile /etc/apache2/pems/${pac.name}.pem SSLCertificateChainFile /etc/apache2/pems-enabled/${dom.user.name}/${dom.name}.chain
SSLCertificateChainFile /etc/apache2/pems/${pac.name}.chain.pem
DocumentRoot /home/doms/${dom.name}/htdocs-ssl DocumentRoot /home/doms/${dom.name}/htdocs-ssl