Merge pull request #23349 from owncloud/hardenings

Hardenings

2 files changed, 4 insertions, 29 deletions

diff --git a/lib/private/filechunking.php b/lib/private/filechunking.php
index 32cbb7559f0..d6ff160870d 100644
--- a/lib/private/filechunking.php
+++ b/lib/private/filechunking.php
@@ -146,35 +146,6 @@ class OC_FileChunking {
 		$cache->remove($prefix.$index);
 	}
 
-	public function signature_split($orgfile, $input) {
-		$info = unpack('n', fread($input, 2));
-		$blocksize = $info[1];
-		$this->info['transferid'] = mt_rand();
-		$count = 0;
-		$needed = array();
-		$cache = $this->getCache();
-		$prefix = $this->getPrefix();
-		while (!feof($orgfile)) {
-			$new_md5 = fread($input, 16);
-			if (feof($input)) {
-				break;
-			}
-			$data = fread($orgfile, $blocksize);
-			$org_md5 = md5($data, true);
-			if ($org_md5 == $new_md5) {
-				$cache->set($prefix.$count, $data);
-			} else {
-				$needed[] = $count;
-			}
-			$count++;
-		}
-		return array(
-			'transferid' => $this->info['transferid'],
-			'needed' => $needed,
-			'count' => $count,
-		);
-	}
-
 	/**
 	 * Assembles the chunks into the file specified by the path.
 	 * Also triggers the relevant hooks and proxies.
diff --git a/lib/private/route/router.php b/lib/private/route/router.php
index 13f7a7a1cfb..03bee3d2037 100644
--- a/lib/private/route/router.php
+++ b/lib/private/route/router.php
@@ -110,6 +110,10 @@ class Router implements IRouter {
 	 * @param null|string $app
 	 */
 	public function loadRoutes($app = null) {
+		if(is_string($app)) {
+			$app = \OC_App::cleanAppId($app);
+		}
+
 		$requestedApp = $app;
 		if ($this->loaded) {
 			return;