webinterface.git

@@ -0,0 +1,26 @@

+<?php

+/*

+This file belongs to the Webinterface of schokokeks.org Hosting

+

+Written 2008-2013 by schokokeks.org Hosting, namely

+  Bernd Wurst <bernd@schokokeks.org>

+  Hanno Böck <hanno@schokokeks.org>

+

+To the extent possible under law, the author(s) have dedicated all copyright and related and neighboring rights to this software to the public domain worldwide. This software is distributed without any warranty.

+

+You should have received a copy of the CC0 Public Domain Dedication along with this software. If not, see 

+http://creativecommons.org/publicdomain/zero/1.0/

+

+Nevertheless, in case you use a significant part of this code, we ask (but not require, see the license) that you keep the authors' names in place and return your changes to the public. We would be especially happy if you tell us what you're going to do with this code.

+*/

+

+require_once('inc/base.php');

+

+$path = config('jquery_ui_path');

+html_header('

+<link rel="stylesheet" href="'.$path.'/themes/base/jquery-ui.css" />

+<script type="text/javascript" src="'.$path.'/jquery-1.9.0.js" ></script>

+<script type="text/javascript" src="'.$path.'/ui/jquery-ui.js" ></script>

+

+');

+

@@ -16,6 +16,7 @@ Nevertheless, in case you use a significant part of this code, we ask (but not r

 require_once('inc/debug.php');

 require_once('inc/security.php');

+require_once('inc/jquery.php');

 require_once('vhosts.php');

 require_once('certs.php');

@@ -92,6 +93,39 @@ html_header("<script type=\"text/javascript\">

       document.getElementById('options_webapp').style.display = 'block';

     }

   }

+

+

+  function showhsts( event ) {

+    var ssl = $('#ssl option:selected').val();

+    if (ssl == 'forward') {

+      $('#hsts_block').show();

+    } else

+      $('#hsts_block').hide();

+  }

+

+  function hsts_preset( event ) {

+    var seconds = $('#hsts_preset option:selected').val();

+    if (seconds == 'custom') {

+      $('#hsts_seconds').show();

+      if ($('#hsts').val() < 0) {

+        $('#hsts').val(2592000); /* 30 Tage */

+      }

+    } else {

+      $('#hsts_seconds').hide();

+      $('#hsts').val(seconds);

+    }

+  }

+

+  $(document).ready(function(){

+    $('#ssl').change(showhsts);

+    showhsts();

+    if ($('#hsts_preset option:selected').val() != 'custom') {

+      $('#hsts_seconds').hide();

+    }

+    $('#hsts_preset').change(hsts_preset);

+    

+  })

+

   </script>");

 $defaultdocroot = $vhost['domain'];

@@ -210,6 +244,12 @@ if ($vhost_type=='webapp')

 	  <input class=\"usageoption\" onclick=\"showAppropriateLines()\" type=\"radio\" name=\"vhost_type\" id=\"vhost_type_webapp\" value=\"webapp\" ".(($vhost_type=='webapp') ? 'checked="checked" ' : '')."/><label for=\"vhost_type_webapp\">&#160;Eine vorgefertigte Applikation nutzen</label><br />

 ";

 }

+$hsts_value = $vhost['hsts'];

+$hsts_preset_values = array("-1" => "aus", "86400" => "1 Tag", "2592000" => "30 Tage", "31536000" => "1 Jahr", "63072000" => "2 Jahre", "custom" => "Individuell");

+$hsts_preset_value = 'custom';

+if (isset($hsts_preset_values[$hsts_value])) {

+  $hsts_preset_value = $hsts_value;

+}

 $form .= "

 	  <input class=\"usageoption\" onclick=\"showAppropriateLines()\" type=\"radio\" name=\"vhost_type\" id=\"vhost_type_dav\" value=\"dav\" ".(($vhost_type=='dav') ? 'checked="checked" ' : '')."/><label for=\"vhost_type_dav\">&#160;WebDAV</label><br />

 	  <input class=\"usageoption\" onclick=\"showAppropriateLines()\" type=\"radio\" name=\"vhost_type\" id=\"vhost_type_svn\" value=\"svn\" ".(($vhost_type=='svn') ? 'checked="checked" ' : '')."/><label for=\"vhost_type_svn\">&#160;Subversion-Server</label>

@@ -228,7 +268,8 @@ $form .= "

       ".($vhost['ssl'] == 'http' ? "<option value=\"http\" selected=\"selected\">kein SSL</option>" : '')."

       ".($vhost['ssl'] == 'https' ? "<option value=\"https\" selected=\"selected\">nur SSL</option>" : '')."

       <option value=\"forward\" ".($vhost['ssl'] == 'forward' ? 'selected="selected"' : '')." >Immer auf SSL umleiten</option>

-    </select>

+    </select>  <span id=\"hsts_block\" style=\"padding-top: 0.2em;\"> <label for=\"hsts\"><a title=\"Mit HSTS können Sie festlegen, dass eine bestimmte Website niemals ohne Verschlüsselung aufgerufen werden soll. Zudem werden Zertifikate strenger geprüft.\" href=\"http://de.wikipedia.org/wiki/Hypertext_Transfer_Protocol_Secure#HSTS\">HSTS</a>:</label> ".html_select('hsts_preset', $hsts_preset_values, $hsts_preset_value)." <span id=\"hsts_seconds\"><input type=\"text\" name=\"hsts\" id=\"hsts\" size=\"10\" style=\"text-align: right;\" value=\"{$hsts_value}\" /> Sekunden</span>

+    </span>

     </div>

     <h5>Logfiles <span class=\"warning\">*</span></h5>

     <div style=\"margin-left: 2em;\">

@@ -83,6 +83,7 @@ function empty_vhost()

   $vhost['php'] = 'php55';

   $vhost['cgi'] = 1;

   $vhost['ssl'] = NULL;

+  $vhost['hsts'] = -1;

   $vhost['suexec_user'] = NULL;

   $vhost['server'] = NULL;

   $vhost['logtype'] = NULL;

@@ -147,6 +148,10 @@ function get_vhost_details($id)

   $ret = mysql_fetch_assoc($result);

+  if ($ret['hsts'] === NULL) {

+    DEBUG('HSTS: '.$ret['hsts']);

+    $ret['hsts'] = -1;

+  }

   $ret['server'] = $ret['server_id'];

   DEBUG($ret);

   return $ret;

@@ -297,6 +302,10 @@ function save_vhost($vhost)

   $php = maybe_null($vhost['php']);

   $cgi = ($vhost['cgi'] == 1 ? 1 : 0);

   $ssl = maybe_null($vhost['ssl']);

+  $hsts = (int) $vhost['hsts'];

+  if ($hsts < 0) {

+    $hsts = "NULL";

+  }

   $suexec_user = 'NULL';

   $available_suexec = available_suexec_users();

@@ -345,11 +354,11 @@ function save_vhost($vhost)

   if ($id != 0) {

     logger(LOG_INFO, 'modules/vhosts/include/vhosts', 'vhosts', 'Updating vhost #'.$id.' ('.$vhost['hostname'].'.'.$vhost['domain'].')');

-    db_query("UPDATE vhosts.vhost SET hostname={$hostname}, domain={$domain}, docroot={$docroot}, php={$php}, cgi={$cgi}, `ssl`={$ssl}, `suexec_user`={$suexec_user}, `server`={$server}, logtype={$logtype}, errorlog={$errorlog}, certid={$cert}, ipv4={$ipv4}, autoipv6={$autoipv6}, options='{$options}', stats={$stats} WHERE id={$id} LIMIT 1");

+    db_query("UPDATE vhosts.vhost SET hostname={$hostname}, domain={$domain}, docroot={$docroot}, php={$php}, cgi={$cgi}, `ssl`={$ssl}, hsts={$hsts}, `suexec_user`={$suexec_user}, `server`={$server}, logtype={$logtype}, errorlog={$errorlog}, certid={$cert}, ipv4={$ipv4}, autoipv6={$autoipv6}, options='{$options}', stats={$stats} WHERE id={$id} LIMIT 1");

   }

   else {

     logger(LOG_INFO, 'modules/vhosts/include/vhosts', 'vhosts', 'Creating vhost '.$vhost['hostname'].'.'.$vhost['domain'].'');

-    $result = db_query("INSERT INTO vhosts.vhost (user, hostname, domain, docroot, php, cgi, `ssl`, `suexec_user`, `server`, logtype, errorlog, certid, ipv4, autoipv6, options, stats) VALUES ({$_SESSION['userinfo']['uid']}, {$hostname}, {$domain}, {$docroot}, {$php}, {$cgi}, {$ssl}, {$suexec_user}, {$server}, {$logtype}, {$errorlog}, {$cert}, {$ipv4}, {$autoipv6}, '{$options}', {$stats})");

+    $result = db_query("INSERT INTO vhosts.vhost (user, hostname, domain, docroot, php, cgi, `ssl`, hsts, `suexec_user`, `server`, logtype, errorlog, certid, ipv4, autoipv6, options, stats) VALUES ({$_SESSION['userinfo']['uid']}, {$hostname}, {$domain}, {$docroot}, {$php}, {$cgi}, {$ssl}, {$hsts}, {$suexec_user}, {$server}, {$logtype}, {$errorlog}, {$cert}, {$ipv4}, {$autoipv6}, '{$options}', {$stats})");

     $id = mysql_insert_id();

   }

   $oldvhost = get_vhost_details($id);

@@ -139,6 +139,15 @@ if ($_GET['action'] == 'edit')

     /* Wenn etwas anderes kommt, ist das "beides". So einfach ist das. */

   }

+  $hsts = NULL;

+  if (isset($_POST['hsts'])) {

+    if (is_numeric($_POST['hsts']) && (int) $_POST['hsts'] > -2) {

+      $hsts = (int) $_POST['hsts'];

+    } else {

+      system_failure('Es wurde ein ungültiger HSTS-Wert eingegeben. Dort sind nur Sekunden erlaubt.');

+    }

+  }

+ 

   $cert = (isset($_POST['cert']) ? (int) $_POST['cert'] : NULL);

   $ipv4 = (isset($_POST['ipv4']) ? $_POST['ipv4'] : NULL);

@@ -205,6 +214,7 @@ if ($_GET['action'] == 'edit')

   $vhost['php'] = $php;

   $vhost['cgi'] = $cgi;

   $vhost['ssl'] = $ssl;

+  $vhost['hsts'] = $hsts;

   $vhost['cert'] = $cert;

   $vhost['ipv4'] = $ipv4;

   $vhost['logtype'] = $logtype;