Modularized baseconfig fetching (api)

2 files changed, 14 insertions, 322 deletions

diff --git a/apis/clientlog.inc.php b/apis/clientlog.inc.php
index 9c261731..81a7dbf7 100644
--- a/apis/clientlog.inc.php
+++ b/apis/clientlog.inc.php
@@ -1,232 +1,16 @@
 <?php
 
-if (empty($_POST['type'])) die('Missing options.');
-$type = mb_strtolower($_POST['type']);
-
-$ip = $_SERVER['REMOTE_ADDR'];
-if (substr($ip, 0, 7) === '::ffff:') $ip = substr($ip, 7);
-
-/*
- * Power/hw/usage stats
- */
-
-if ($type{0} === '~') {
-	// UUID is mandatory
-	$uuid = Request::post('uuid', '', 'string');
-	if (strlen($uuid) !== 36) die("Invalid UUID.\n");
-	$macaddr = Request::post('macaddr', '', 'string');
-	if (!empty($macaddr) && substr($uuid, 0, 16) === '000000000000000-') {
-		// Override uuid if the mac is known and unique
-		$res = Database::simpleQuery('SELECT machineuuid FROM machine WHERE macaddr = :macaddr', array('macaddr' => $macaddr));
-		$override = false;
-		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
-			if ($override !== false) {
-				$override = false;
-				break;
-			}
-			$override = $row['machineuuid'];
-		}
-		if ($override !== false) {
-			$uuid = $override;
-		}
-	}
-	$NOW = time();
-	$old = Database::queryFirst('SELECT logintime, lastseen FROM machine WHERE machineuuid = :uuid', array('uuid' => $uuid));
-	if ($old !== false) {
-		settype($old['logintime'], 'integer');
-		settype($old['lastseen'], 'integer');
-	}
-	// Handle event type
-	if ($type === '~poweron') {
-		// Poweron & hw stats
-		$uptime = Request::post('uptime', '', 'integer');
-		if (strlen($macaddr) > 17) die("Invalid MAC.\n");
-		if ($uptime < 0 || $uptime > 4000000) die("Implausible uptime.\n");
-		$realcores = Request::post('realcores', 0, 'integer');
-		if ($realcores < 0 || $realcores > 512) $realcores = 0;
-		$mbram = Request::post('mbram', 0, 'integer');
-		if ($mbram < 0 || $mbram > 102400) $mbram = 0;
-		$kvmstate = Request::post('kvmstate', 'UNKNOWN', 'string');
-		$valid = array('UNKNOWN', 'UNSUPPORTED', 'DISABLED', 'ENABLED');
-		if (!in_array($kvmstate, $valid)) $kvmstate = 'UNKNOWN';
-		$cpumodel = Request::post('cpumodel', '', 'string');
-		$systemmodel = Request::post('systemmodel', '', 'string');
-		$id44mb = Request::post('id44mb', 0, 'integer');
-		if ($id44mb < 0 || $id44mb > 10240000) $id44mb = 0;
-		$badsectors = Request::post('badsectors', 0, 'integer');
-		if ($badsectors < 0 || $badsectors > 100000) $badsectors = 0;
-		$hostname = gethostbyaddr($ip);
-		if (!is_string($hostname) || $hostname === $ip) {
-			$hostname = '';
-		}
-		$data = Request::post('data', '', 'string');
-		if ($uptime < 120) {
-			// See if we have a lingering session, create statistic entry if so
-			if ($old !== false && $old['logintime'] !== 0) {
-				$sessionLength = $old['lastseen'] - $old['logintime'];
-				if ($sessionLength > 0 && $sessionLength < 86400*2) {
-					$start = $old['logintime'];
-					if ($start === 0) $start = $NOW;
-					Database::exec('INSERT INTO statistic (dateline, typeid, machineuuid, clientip, username, data)'
-						. " VALUES (:start, '~session-length', :uuid, :clientip, '', :length)", array(
-							'start'     => $start,
-							'uuid'     => $uuid,
-							'clientip'  => $ip,
-							'length'    => $sessionLength
-					));
-				}
-			}
-			// Write poweroff period length to statistic table
-			if ($old !== false) {
-				$lastSeen = $old['lastseen'] + 500;
-				$offtime = ($NOW - $uptime) - $lastSeen;
-				if ($offtime > 600 && $offtime < 86400 * 90) {
-					Database::exec('INSERT INTO statistic (dateline, typeid, machineuuid, clientip, username, data)'
-						. " VALUES (:shutdown, '~offline-length', :uuid, :clientip, '', :length)", array(
-							'shutdown' => $lastSeen,
-							'uuid'     => $uuid,
-							'clientip' => $ip,
-							'length'   => $offtime
-						));
-				}
-			}
-		}
-		// Create/update machine entry
-		Database::exec('INSERT INTO machine '
-			. '(machineuuid, macaddr, clientip, firstseen, lastseen, logintime, position, lastboot, realcores, mbram,'
-			. ' kvmstate, cpumodel, systemmodel, id44mb, badsectors, data, hostname) VALUES '
-			. "(:uuid, :macaddr, :clientip, :firstseen, :lastseen, 0, '', :lastboot, :realcores, :mbram,"
-			. ' :kvmstate, :cpumodel, :systemmodel, :id44mb, :badsectors, :data, :hostname)'
-			. ' ON DUPLICATE KEY UPDATE'
-			. ' macaddr = VALUES(macaddr),'
-			. ' clientip = VALUES(clientip),'
-			. ' lastseen = VALUES(lastseen),'
-			. ($uptime < 180 ? ' logintime = 0,' : '')
-			. ' lastboot = VALUES(lastboot),'
-			. ' realcores = VALUES(realcores),'
-			. ' mbram = VALUES(mbram),'
-			. ' kvmstate = VALUES(kvmstate),'
-			. ' cpumodel = VALUES(cpumodel),'
-			. ' systemmodel = VALUES(systemmodel),'
-			. ' id44mb = VALUES(id44mb),'
-			. ' badsectors = VALUES(badsectors),'
-			. ' data = VALUES(data),'
-			. " hostname = If(VALUES(hostname) = '', hostname, VALUES(hostname))", array(
-			'uuid'       => $uuid,
-			'macaddr'    => $macaddr,
-			'clientip'   => $ip,
-			'firstseen'  => $NOW,
-			'lastseen'   => $NOW,
-			'lastboot'   => $NOW - $uptime,
-			'realcores'  => $realcores,
-			'mbram'      => $mbram,
-			'kvmstate'   => $kvmstate,
-			'cpumodel'   => $cpumodel,
-			'systemmodel'=> $systemmodel,
-			'id44mb'     => $id44mb,
-			'badsectors' => $badsectors,
-			'data'       => $data,
-			'hostname'   => $hostname,
-		));
-		// Write statistics data
-		
-	} else if ($type === '~runstate') {
-		// Usage (occupied/free)
-		$sessionLength = 0;
-		$used = Request::post('used', 0, 'integer');
-		if ($old === false) die("Unknown machine.\n");
-		// Figure out what's happening
-		if ($used === 0) {
-			// Is not in use
-			if ($old['logintime'] !== 0) {
-				// Was in use, is free now
-				// 1) Log last session length
-				if ($NOW - $old['lastseen'] > 610) {
-					// Old session timed out - might be caused by hard reboot
-					$sessionLength = $old['lastseen'] - $old['logintime'];
-				} else {
-					$sessionLength = $NOW - $old['logintime'];
-				}
-			}
-			Database::exec('UPDATE machine SET lastseen = UNIX_TIMESTAMP(), logintime = 0 WHERE machineuuid = :uuid', array('uuid' => $uuid));
-		} else {
-			// Machine is in use
-			if ($old['logintime'] !== 0 && $NOW - $old['lastseen'] > 610) {
-				// Old session timed out - might be caused by hard reboot
-				$sessionLength = $old['lastseen'] - $old['logintime'];
-			}
-			if ($sessionLength !== 0 || $old['logintime'] === 0) {
-				// This event is a start of a new session, rather than an update
-				Database::exec('UPDATE machine SET lastseen = UNIX_TIMESTAMP(), logintime = UNIX_TIMESTAMP() WHERE machineuuid = :uuid', array('uuid' => $uuid));
-			} else {
-				// Nothing changed, simple lastseen update
-				Database::exec('UPDATE machine SET lastseen = UNIX_TIMESTAMP() WHERE machineuuid = :uuid', array('uuid' => $uuid));
-			}
-		}
-		// 9) Log last session length if applicable
-		if ($sessionLength > 0 && $sessionLength < 86400*2) {
-			$start = $old['logintime'];
-			if ($start === 0) $start = $NOW;
-			Database::exec('INSERT INTO statistic (dateline, typeid, machineuuid, clientip, username, data)'
-				. " VALUES (:start, '~session-length', :uuid, :clientip, '', :length)", array(
-					'start'     => $start,
-					'uuid'     => $uuid,
-					'clientip'  => $ip,
-					'length'    => $sessionLength
-			));
-		}
-	} elseif ($type === '~poweroff') {
-		if ($old !== false && (int)$old['logintime'] !== 0) {
-			$sessionLength = $old['lastseen'] - $old['logintime'];
-			if ($sessionLength > 0 && $sessionLength < 86400*2) {
-				$start = $old['logintime'];
-				if ($start === 0) $start = $NOW;
-				Database::exec('INSERT INTO statistic (dateline, typeid, clientip, username, data)'
-					. " VALUES (:start, '~session-length', :clientip, '', :length)", array(
-						'start'     => $start,
-						'clientip'  => $ip,
-						'length'    => $sessionLength
-				));
-			}
-		}
-		Database::exec('UPDATE machine SET logintime = 0, lastseen = UNIX_TIMESTAMP() - 600 WHERE machineuuid = :uuid', array('uuid' => $uuid));
-	}
-	die("OK. (RESULT=0)\n");
-}
-
 /*
- * Normal logging
+ * For compatibility with old slx-admin, where apis were not connected to a module.
+ * This is clientlog, which belonged to module syslog really, plus messy hacked in
+ * hook for machine+user statistics.
  */
 
-if (!isset($_POST['description'])) die('Missing options..');
-
-$description = $_POST['description'];
-$longdesc = '';
-if (isset($_POST['longdesc'])) $longdesc = $_POST['longdesc'];
-
-// Spam from IP
-$row = Database::queryFirst('SELECT Count(*) AS cnt FROM clientlog WHERE clientip = :client AND dateline + 3600 > UNIX_TIMESTAMP()', array(':client' => $ip));
-if ($row !== false && $row['cnt'] > 150) exit(0);
-
+if (empty($_POST['type'])) die('Missing options.');
+$type = mb_strtolower($_POST['type']);
 
-if ($type{0} === '.' && preg_match('#^\[([^\]]+)\]\s*(.*)$#', $description, $out)) {
-	// Special case '.'-type:
-	Database::exec('INSERT INTO statistic (dateline, typeid, clientip, username, data) VALUES (UNIX_TIMESTAMP(), :type, :client, :username, :data)', array(
-		'type'        => $type,
-		'client'      => $ip,
-		'username'    => $out[1],
-		'data'        => $out[2],
-	));
-	
+if ($type{0} === '~' || $type{0} === '.') {
+	require 'modules/statistics/api.inc.php';
 } else {
-	
-	Database::exec('INSERT INTO clientlog (dateline, logtypeid, clientip, description, extra) VALUES (UNIX_TIMESTAMP(), :type, :client, :description, :longdesc)', array(
-		'type'        => $type,
-		'client'      => $ip,
-		'description' => $description,
-		'longdesc'    => $longdesc,
-	));
+	require 'modules/syslog/api.inc.php';
 }
-
-echo "OK.\n";
-
diff --git a/apis/getconfig.inc.php b/apis/getconfig.inc.php
index 2447d622..3fe05ed1 100644
--- a/apis/getconfig.inc.php
+++ b/apis/getconfig.inc.php
@@ -1,104 +1,12 @@
 <?php
 
-$ip = $_SERVER['REMOTE_ADDR'];
-if (substr($ip, 0, 7) === '::ffff:') {
-	$ip = substr($ip, 7);
-}
-
-/**
- * Escape given string so it is a valid string in sh that can be surrounded
- * by single quotes ('). This basically turns _'_ into _'"'"'_
- *
- * @param string $string input
- * @return string escaped sh string
+/*
+ * For compatibility with old slx-admin, where apis were not connected to a module.
+ * This is getconfig, which belongs to baseconfig logically.
  */
-function escape($string)
-{
-	return str_replace("'", "'\"'\"'", $string);
-}
 
-// Location handling: figure out location
-$locationId = false; // TODO: machine specific mapping
-if ($locationId === false) {
-	// Fallback to subnets
-	$locationId = Location::getFromIp($ip);
-}
-$matchingLocations = array();
-if ($locationId !== false) {
-	// Get all parents
-	settype($locationId, 'integer');
-	$locations = Location::getLocationsAssoc();
-	$find = $locationId;
-	while (isset($locations[$find]) && !in_array($find, $matchingLocations)) {
-		$matchingLocations[] = $find;
-		$find = (int)$locations[$find]['parentlocationid'];
-	}
-	echo "SLX_LOCATIONS='" . escape(implode(' ', $matchingLocations)) . "'\n";
+if (!Module::isAvailable('baseconfig')) {
+	Util::traceError('Module baseconfig not available');
 }
 
-$configVars = array();
-// Query location specific settings (from bottom to top)
-if (!empty($matchingLocations)) {
-	// First get all settings for all locations we're in
-	$list = implode(',', $matchingLocations);
-	$res = Database::simpleQuery("SELECT locationid, setting, value FROM setting_location WHERE locationid IN ($list)");
-	$tmp = array();
-	while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
-		$tmp[(int)$row['locationid']][$row['setting']] = $row['value'];
-	}
-	// $matchingLocations contains the location ids sorted from closest to furthest, so we use it to make sure the order
-	// in which they override is correct (closest setting wins, e.g. room setting beats department setting)
-	foreach ($matchingLocations as $lid) {
-		if (!isset($tmp[$lid])) continue;
-		foreach ($tmp[$lid] as $setting => $value) {
-			if (!isset($configVars[$setting])) {
-				$configVars[$setting] = $value;
-			}
-		}
-	}
-	unset($tmp);
-}
-
-// Dump config from DB
-$res = Database::simpleQuery('SELECT setting.setting, setting.defaultvalue, tbl.value
-	FROM setting
-	LEFT JOIN setting_global AS tbl USING (setting)
-	ORDER BY setting ASC'); // TODO: Add setting groups and sort order
-while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
-	if (isset($configVars[$row['setting']])) {
-		$row['value'] = $configVars[$row['setting']];
-	} elseif (is_null($row['value'])) {
-		$row['value'] = $row['defaultvalue'];
-	}
-	echo $row['setting'] . "='" . escape($row['value']) . "'\n";
-}
-
-// Additional "intelligent" config
-
-// Remote log URL
-echo "SLX_REMOTE_LOG='http://" . escape($_SERVER['SERVER_ADDR']) . escape($_SERVER['SCRIPT_NAME']) . "?do=clientlog'\n";
-// vm list url
-echo "SLX_VMCHOOSER_BASE_URL='http://" . escape($_SERVER['SERVER_ADDR']) . "/vmchooser/'\n";
-
-// VMStore path and type
-$vmstore = Property::getVmStoreConfig();
-if (is_array($vmstore)) {
-	switch ($vmstore['storetype']) {
-	case 'internal';
-		echo "SLX_VM_NFS='" . escape($_SERVER['SERVER_ADDR']) . ":/srv/openslx/nfs'\n";
-		break;
-	case 'nfs';
-		echo "SLX_VM_NFS='" . escape($vmstore['nfsaddr']) . "'\n";
-		break;
-	case 'cifs';
-		echo "SLX_VM_NFS='" . escape($vmstore['cifsaddr']) . "'\n";
-		echo "SLX_VM_NFS_USER='" . escape($vmstore['cifsuserro']) . "'\n";
-		echo "SLX_VM_NFS_PASSWD='" . escape($vmstore['cifspasswdro']) . "'\n";
-		break;
-	}
-}
-
-
-// For quick testing or custom extensions: Include external file that should do nothing
-// more than outputting more key-value-pairs. It's expected in the webroot of slxadmin
-if (file_exists('client_config_additional.php')) @include('client_config_additional.php');
+require 'modules/baseconfig/api.inc.php';
\ No newline at end of file