Changeset 999

Timestamp:

02/13/08 00:08:15 (7 months ago)

Author:

rats

Message:

* Fixed #808: webmail.mydomain.tld, pma.mydomain.tld
* Fixed #864: improve the detection of the disk usage of backups so users can't abuse
* Fixed #934: Prohibit creation of default subdomains

Files:

• trunk/CHANGELOG (modified) (1 diff)
• trunk/configs/apache/parts/dmn_entry.tpl (modified) (1 diff)
• trunk/docs/Debian/INSTALL (modified) (2 diffs)
• trunk/engine/quota/ispcp-dsk-quota (modified) (2 diffs)
• trunk/engine/setup/ispcp-update (modified) (7 diffs)
• trunk/gui/client/add_subdomain.php (modified) (3 diffs)
• trunk/gui/client/manage_domains.php (modified) (1 diff)
• trunk/gui/include/vfs.php (modified) (18 diffs)

trunk/CHANGELOG

@@ -1 +1 @@
-ispCP ω 1.0.0 Changelog
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+2008-02-13 Benedikt Heintel
+        - CONFIGS:
+                * Fixed #808: webmail.mydomain.tld, pma.mydomain.tld
+        - ENGINE:
+                * Fixed #864: improve the detection of the disk usage of backups so users can't abuse
+        - GUI:
+                * Fixed #934: Prohibit creation of default subdomains
-
-2008-02-12 Christian Hernmarck

trunk/configs/apache/parts/dmn_entry.tpl

@@ -18 +18 @@
-
-    Alias /errors   {WWW_DIR}/{DMN_NAME}/errors/
+
+    Redirect permanent /ftp             http://{BASE_SERVER_VHOST}/ftp/
+    Redirect permanent /pma             http://{BASE_SERVER_VHOST}/pma/
+    Redirect permanent /webmail http://{BASE_SERVER_VHOST}/webmail/
-
-    ErrorDocument 401 /errors/401.html

trunk/docs/Debian/INSTALL

@@ -63 +63 @@
-
-3. Install the required modules
-f
+F
-        # apt-get update && apt-get upgrade
-
@@ -92 +92 @@
-        (when you get to the rootkithunter screen, select two time 'yes')
-
+        Now install needed Perl modules:
+
+        # cpan
+        cpan> install FindBin
+        cpan> install Net::LibIDN
+        cpan> quit
+
-4. (optional) Check the ispcp.conf and adapt it to your requirements.
-   An overview over the variables you can find in the FAQ on

trunk/engine/quota/ispcp-dsk-quota

@@ -4 +4 @@
-# Copyright (c) 2001-2006 by moleSoftware GmbH
-# http://www.molesoftware.com
-7
+8
-# http://isp-control.net
-#
@@ -106 +106 @@
-        my $size = 0;
-
-*.bz2" --exclude="backups/
+$domain_name-*.bz2" --exclude="backups/$domain_name-
-
-        $s =~ /^(\d+)/; $size += $1;

trunk/engine/setup/ispcp-update

@@ -118 +118 @@
-\t(2) VHCS 2.4.8 RC1
-\t(3) ispCP OMEGA 1.0.0 RC2 (incl. b and c)
+\t(4) ispCP OMEAG 1.0.0 RC3
-\t(0) abort
-MSG
@@ -127 +128 @@
-        chop($rdata);
-
-3
+4
-                print STDOUT "\tPlease select an item mentioned above: ";
-                $rdata = readline(\*STDIN);
@@ -324 +325 @@
-                exit_werror("SQL Update failed.");
-        }
+
+        # Delete vhcs2 Database
+        ($rs, $rdata) = doSQL("DROP DATABASE IF EXISTS `vhcs2`;");
+    if ($rs != 0) {
+        print STDOUT "failed!\n";
+        exit_werror($rdata, $rs);
+    }
-
-    print STDOUT "\tdone\n";
@@ -722 +730 @@
-}
-
+sub patch_ispcp_rc3() {
+        push_el(\@main::el, 'patch_ispcp_rc3()', 'Ending...');
+
+        print STDOUT "\tNothing to do yet!\n";
+
+        push_el(\@main::el, 'patch_ispcp_rc3()', 'Ending...');
+        return 0;
+}
+
-sub prepare_update {
-        my ($rs, $rdata) = (undef, undef);
@@ -733 +750 @@
-        # Abort
-        if ($main::ua{'update'} eq 0) {
-
+.
-        }
-        # VHCS update
@@ -755 +772 @@
-                return $rs if ($rs != 0);
-        }
-
-eq
+/3
+gt
-                stop_services("/tmp/vhcs2-backup-all.lock");
-
@@ -774 +791 @@
-                }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-                return $rs if ($rs != 0);
-

trunk/gui/client/add_subdomain.php

@@ -4 +4 @@
- *
- * @copyright   2001-2006 by moleSoftware GmbH
-7
+8
- * @link                http://isp-control.net
- (2007)
+
- *
- * @license
@@ -110 +110 @@
-        $rs_domain = exec_query($sql, $query_domain, array($domain_name));
-
+        # Prohibit www. mail. nsX. imap. pop. pop3. relay. smtp. ftp. pma. webmail.
+        if ($sub_name == "www" || $sub_name == "mail" || preg_match('/^ns[0-9]{1,3}$/i', $sub_name) ||
+                $sub_name == "imap" || $sub_name == "pop" || $sub_name == "pop3" ||
+                $sub_name == "relay" || $sub_name == "smtp" || $sub_name == "ftp" ||
+                $sub_name == "pma" || $sub_name == "webmail") {
+                return true;
+        }
+
-        if ($rs_subdomain->fields['cnt'] == 0 && $rs_domain->fields['cnt'] == 0)
-                return false;
@@ -248 +256 @@
-
-                if (subdmn_exists($sql, $user_id, $domain_id, $sub_name)) {
-
+ or is not allowed
-                } else if (!chk_subdname($sub_name . "." . $dmn_name)) {
-                        set_page_message(tr('Wrong subdomain syntax!'));

trunk/gui/client/manage_domains.php

@@ -4 +4 @@
- *
- * @copyright   2001-2006 by moleSoftware GmbH
-
-
+
- * @link                http://isp-control.net
- (2007)
+
- *
- * @license

trunk/gui/include/vfs.php

@@ -1 +1 @@
-<?php
-/**
- ispCP (OMEGA) - Virtual Hosting Control System | Omega Version
+ispCP ω (OMEGA) a Virtual Hosting Control System
- *
-
-
-
-
+
+
+
- *
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-/*
@@ -26 +24 @@
- * File types definition
- */
- 
+
-define('VFS_TYPE_LINK', 'l');
-define('VFS_TYPE_FILE', '-');
@@ -33 +31 @@
- * Possible VFS Transfer modes
- */
- 
+
-define('VFS_BINARY', FTP_BINARY);
-
@@ -43 +41 @@
- */
-class vfs {
-
-        /**
-         * Domain name of this filesystem
@@ -88 +85 @@
-         * left as work for the caller.
-         *
- string   $domain 
- resource $db     
+string $domain
+resource $db
-         * @return vfs
-         */
@@ -101 +98 @@
-         * PHP5 constructor
-         *
- string  
- resource $db    
+string
+resource $db
-         * @return vfs
-         */
-        function __construct($domain, &$db) {
-    
- 
-    =& 
+       
+
+= &
-
-                if (!defined("VFS_TMP_DIR")) {
-  
+       
-                }
-                $_ENV['TMPDIR'] = VFS_TMP_DIR;
@@ -131 +128 @@
-         * handler, but we're a "black box" ;).
-         *
- 
+
-         */
-        function setDb(&$db) {
-& 
+ &
-        }
-
@@ -143 +140 @@
-         */
-        function _createTmpUser() {
-
-
+
-                // Get domain data
-                $query = 'select domain_uid, domain_gid
@@ -150 +146 @@
-                                  where  domain_name = ?';
-                $rs = exec_query($this->_db, $query, array($this->_domain));
-
-
-
-
+
+
+
-                // Generate a random userid and password
-  = uniqid('tmp_').'@'.
-
+= uniqid('tmp_') . '@' . 
+ 
-                $passwd = crypt_user_ftp_pass($this->_passwd);
-
-                // Create the temporary user
-                $query = <<<SQL_QUERY
@@ -166 +160 @@
-                    (?, ?, ?, ?, ?, ?)
-SQL_QUERY;
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-                // All ok
-  
+
-                return true;
-        }
@@ -197 +189 @@
-         * Open the virtual file system
-         *
-     
+ 
-         */
-        function open() {
-                // Check if we're already open
- is_resource($this->_handle) 
+is_resource($this->_handle)
-                        return true;
-                }
-
-                // Check if we have a valid ispcp database
-
-
-
-
-
+
+
+
-                // Create the temporary ftp account
-                $result = $this->_createTmpUser();
-
-
-
-
+
+
+
-                // 'localhost' for testing purposes. I have to study if a better
-                // $this->_domain would work on all situations
-                $this->_handle = @ftp_connect('localhost');
- !is_resource($this->_handle) 
+!is_resource($this->_handle)
-                        $this->close();
-                        return false;
-                }
-
-                // Perform actual login
- 
- !$response 
+
+!$response
-                        $this->close();
-                        return false;
-                }
-
-                // All went ok! :)
-                return true;
@@ -238 +224 @@
-        /**
-         * Closes the virtual file system
-         *
-         */
-        function close() {
@@ -258 +243 @@
-         * either in short (default) or long mode.
-         *
- 
- 
+
+
-         */
-        function ls($dirname) {
-                // Ensure that we're open
-
-
-
-
+
+
+
-                // Path is always relative to the root vfs
-0,
+ 0, 
-                        $dirname = '/' . $dirname;
-                }
-
-                // No security implications, the FTP server handles
-                // this for us
- $this->_handle, '-a '.$dirname, false 
- !$list 
+$this->_handle, '-a ' . $dirname, false
+!$list
-                        return false;
-                }
-                $len = count($list);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-                }
-
@@ -301 +283 @@
-         * Checks for file existance
-         *
- 
- 
+
+
-         *                                      VFS_TYPE_LINK or VFS_TYPE_FILE.
-         * @return boolean Returns TRUE if file exists or FALSE if it doesn't exist.
-         */
-=
+ = 
-                // Ensure that we're open
-
-
-
-
+
+
+
-                // Actually get the listing
-                $dirname = dirname($file);
-                $list = $this->ls($dirname);
-
-
-
+
+
-                // We get filenames only from the listing
-                $file = basename($file);
-
-                // Try to match it
-                foreach($list as $entry) {
-                        // Skip non-matching files
- $entry['file'] != $file 
+$entry['file'] != $file
-                                continue;
-                        }
-                        // Check type
- $type !== null && $entry['type'] != $type 
+$type !== null && $entry['type'] != $type
-                                return false;
-
-                        // Matched and same type (or no type specified)
-                        return true;
@@ -340 +318 @@
-         * Retrieves a file from the virtual file system
-         *
- 
- int
+
+int $
-         * @return boolean Returns TRUE on succes or FALSE on failure.
-         */
-=
+ = 
-                // Ensure that we're open
-
-
-
-
+
+
+
-                // Get a temporary file name
-                $tmp = tempnam(VFS_TMP_DIR, 'vfs_');
-                // Get the actual file
-
-
-
-
-
+
+
+
+
-                // Retrieve file contents
-                $res = file_get_contents($tmp);
-
-                // Delete temporary file
-                unlink($tmp);
@@ -372 +347 @@
-         * @param string $file VFS file path.
-         * @param string $content File contents.
-
+$ 
-         * @return boolean Returns TRUE on success or FALSE on failure.
-         */
-
-
+
-                // Ensure that we're open
-
-
-
-
+
+
+
-                // Get a temporary file name
-                $tmp = tempnam(VFS_TMP_DIR, 'vfs_');
-
-                // Save temporary file
-                $res = file_put_contents($tmp, $content);
-
-
-
-
+
+
+
-                // Upload it
-
-
-
-
-
+
+
+
+
-                // Remove temp file
-                unlink($tmp);
@@ -402 +372 @@
-                return true;
-        }
-
-}
-
@@ -409 +378 @@
- */
-if (!function_exists('file_put_contents')) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
-
-?>