import changetype add

lam/lib/import.inc

@@ -265,6 +265,49 @@ class Importer {
 			}
 			return new AddEntryTask($dn, $attributes);
 		}
+		else {
+			$type = $firstAttribute[Importer::VALUE];
+			$changes = array();
+			$subtasks = array();
+			$currentLines = array();
+			$linesCount = sizeof($entry);
+			for ($i = 0; $i < $linesCount; $i++) {
+				$line = $entry[$i];
+				if ($line === '-') {
+					$subtasks[] = $this->getChangeTypeTask($dn, $currentLines, $type);
+					$currentLines = array();
+					$i++;
+					$line = $entry[$i];
+					$lineTypeData = $this->getLineKeyValue($line);
+					if ($lineTypeData[Importer::KEY] != Importer::CHANGETYPE) {
+						throw new LAMException(_('Invalid data'), htmlspecialchars($line));
+					}
+				}
+				$currentLines[] = $line;
+			}
+			$subtasks[] = $this->getChangeTypeTask($dn, $currentLines, $type);
+			return new MultiTask($subtasks);
+		}
+	}
+
+	/**
+	 * Returns a task for LDIF changeType entry.
+	 *
+	 * @param string $dn DN
+	 * @param string $lines lines
+	 * @param string $type change type
+	 * @return ImporterTask task
+	 */
+	private function getChangeTypeTask($dn, $lines, $type) {
+		$attributes = array();
+		foreach ($lines as $line) {
+			$lineData = $this->getLineKeyValue($line);
+			$attributes[$lineData[Importer::KEY]][] = $lineData[Importer::VALUE];
+		}
+		if ($type === 'add') {
+			return new AddAttributesTask($dn, $attributes);
+		}
+		throw new LAMException(_('Invalid data'), htmlspecialchars($dn) . ' - ' . Importer::CHANGETYPE . ': ' . htmlspecialchars($type));
 	}
 
 	/**
@@ -293,6 +336,9 @@ class Importer {
 	 */
 	private function getLineKeyValue($line) {
 		$parts = explode(':', $line, 2);
+		if (sizeof($parts) !== 2) {
+			throw new LAMException(_('Invalid data'), htmlspecialchars($line));
+		}
 		if (substr($parts[Importer::VALUE], 0, 1) == ':') {
 			$value = base64_decode(trim(substr($parts[Importer::VALUE], 1)));
 		}
@@ -356,4 +402,83 @@ class AddEntryTask implements ImporterTask {
 
 }
 
+/**
+ * Combines multiple import tasks.
+ *
+ * @author Roland Gruber
+ */
+class MultiTask implements ImporterTask {
+
+	/**
+	 * @var ImporterTask[] tasks
+	 */
+	private $tasks = array();
+
+	/**
+	 * Constructor
+	 *
+	 * @param ImporterTask[] $tasks tasks
+	 */
+	public function __construct($tasks) {
+		$this->tasks = $tasks;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \LAM\TOOLS\IMPORT_EXPORT\ImporterTask::run()
+	 */
+	public function run() {
+		foreach ($this->tasks as $task) {
+			$task->run();
+		}
+		return Importer::formatMessage('INFO', _('LDAP operation successful.'), htmlspecialchars($this->dn));
+	}
+
+	/**
+	 * Returns the list of subtasks.
+	 *
+	 * @return ImporterTask[]
+	 */
+	public function getTasks() {
+		return $this->tasks;
+	}
+
+}
+
+/**
+ * Adds attributes to an existing LDAP entry.
+ *
+ * @author Roland Gruber
+ */
+class AddAttributesTask implements ImporterTask {
+
+	private $dn = '';
+	private $attributes = array();
+
+	/**
+	 * Constructor
+	 *
+	 * @param string $dn DN
+	 * @param array[string[]] $attributes list of attributes
+	 */
+	public function __construct($dn, $attributes) {
+		$this->dn = $dn;
+		$this->attributes = $attributes;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \LAM\TOOLS\IMPORT_EXPORT\ImporterTask::run()
+	 */
+	public function run() {
+		$ldap = $_SESSION['ldap']->server();
+		$success = @ldap_mod_add($ldap, $this->dn, $this->attributes);
+		if ($success) {
+			return '';
+		}
+		throw new LAMException(sprintf(_('Was unable to create DN: %s.'), $this->dn), getExtendedLDAPErrorMessage($ldap));
+	}
+
+}
+
 ?>

lam/tests/lib/importTest.php

@@ -1,5 +1,7 @@
 <?php
 use \LAM\TOOLS\IMPORT_EXPORT\Importer;
+use LAM\TOOLS\IMPORT_EXPORT\MultiTask;
+use LAM\TOOLS\IMPORT_EXPORT\AddAttributesTask;
 /*
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
@@ -122,4 +124,43 @@ class ImporterTest extends PHPUnit_Framework_TestCase {
 		$this->assertEquals(1, sizeof($tasks));
 	}
 
+	/**
+	 * Change entry with invalid changetype.
+	 */
+	public function testChangeInvalidType() {
+		$lines = array(
+			"version: 1",
+			"",
+			"dn: uid=test,dc=example,dc=com",
+			"changeType: invalid",
+			"uid: test",
+		);
+
+		$this->setExpectedException(LAMException::class, 'uid=test,dc=example,dc=com - changeType: invalid');
+
+		$importer = new Importer();
+		$tasks = $importer->getTasks($lines);
+	}
+
+	/**
+	 * Change entry with add changetype.
+	 */
+	public function testChangeAdd() {
+		$lines = array(
+			"version: 1",
+			"",
+			"dn: uid=test,dc=example,dc=com",
+			"changeType: add",
+			"uid: test",
+		);
+
+		$importer = new Importer();
+		$tasks = $importer->getTasks($lines);
+		$this->assertEquals(1, sizeof($tasks));
+		$multiTask = $tasks[0];
+		$this->assertEquals(MultiTask::class, get_class($multiTask));
+		$this->assertEquals(1, sizeof($multiTask->getTasks()));
+		$this->assertEquals(AddAttributesTask::class, get_class($multiTask->getTasks()[0]));
+	}
+
 }