fix deletion for configIDs < s10

Also move ensureConfigIDExists checks into try, it might throw DB related exceptions Signed-off-by: Arthur Schiwon <[email protected]>
nextcloud · Jan 20, 2017 · 91ed70f · 91ed70f
1 parent 9ca4065
commit 91ed70f
Showing 1 changed file with 12 additions and 14 deletions.
diff --git a/apps/user_ldap/lib/Controller/ConfigAPIController.php b/apps/user_ldap/lib/Controller/ConfigAPIController.php
@@ -145,12 +145,6 @@ public function create() {
 	 * @throws OCSException
 	 */
 	public function delete($configID) {
-		$initial = substr($configID, 0, 1);
-		$number  = substr($configID, 1);
-		if($initial !== 's' || $number !== strval(intval($number))) {
-			throw new OCSBadRequestException('Not a valid config ID');
-		}
-
 		try {
 			$this->ensureConfigIDExists($configID);
 			if(!$this->ldapHelper->deleteServerConfiguration($configID)) {
@@ -190,13 +184,13 @@ public function delete($configID) {
 	 * @throws OCSException
 	 */
 	public function modify($configID, $configData) {
-		$this->ensureConfigIDExists($configID);
+		try {
+			$this->ensureConfigIDExists($configID);
 
-		if(!is_array($configData)) {
-			throw new OCSBadRequestException('configData is not properly set');
-		}
+			if(!is_array($configData)) {
+				throw new OCSBadRequestException('configData is not properly set');
+			}
 
-		try {
 			$configuration = new Configuration($configID);
 			$configKeys = $configuration->getConfigTranslationArray();
 
@@ -207,6 +201,8 @@ public function modify($configID, $configData) {
 			}
 
 			$configuration->saveConfiguration();
+		} catch(OCSException $e) {
+			throw $e;
 		} catch (\Exception $e) {
 			$this->logger->logException($e);
 			throw new OCSException('An issue occurred when modifying the config.');
@@ -287,9 +283,9 @@ public function modify($configID, $configData) {
 	 * @throws OCSException
 	 */
 	public function show($configID, $showPassword = false) {
-		$this->ensureConfigIDExists($configID);
-
 		try {
+			$this->ensureConfigIDExists($configID);
+
 			$config = new Configuration($configID);
 			$data = $config->getConfiguration();
 			if(!boolval(intval($showPassword))) {
@@ -301,6 +297,8 @@ public function show($configID, $showPassword = false) {
 					$data[$key] = $value;
 				}
 			}
+		} catch(OCSException $e) {
+			throw $e;
 		} catch (\Exception $e) {
 			$this->logger->logException($e);
 			throw new OCSException('An issue occurred when modifying the config.');
@@ -317,7 +315,7 @@ public function show($configID, $showPassword = false) {
 	 */
 	private function ensureConfigIDExists($configID) {
 		$prefixes = $this->ldapHelper->getServerConfigurationPrefixes();
-		if(!in_array($configID, $prefixes)) {
+		if(!in_array($configID, $prefixes, true)) {
 			throw new OCSNotFoundException('Config ID not found');
 		}
 	}