Merge pull request #10420 from owncloud/external-share-self-signed

Make external shares work with imported self signed certificates

2 files changed, 0 insertions, 58 deletions

diff --git a/apps/files_external/ajax/addRootCertificate.php b/apps/files_external/ajax/addRootCertificate.php
deleted file mode 100644
index fcd3a617ada..00000000000
--- a/apps/files_external/ajax/addRootCertificate.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-OCP\JSON::checkAppEnabled('files_external');
-OCP\JSON::callCheck();
-
-if ( ! ($filename = $_FILES['rootcert_import']['name']) ) {
-	header('Location:' . OCP\Util::linkToRoute( "settings_personal" ));
-	exit;
-}
-
-$fh = fopen($_FILES['rootcert_import']['tmp_name'], 'r');
-$data = fread($fh, filesize($_FILES['rootcert_import']['tmp_name']));
-fclose($fh);
-$filename = $_FILES['rootcert_import']['name'];
-
-$view = new \OC\Files\View('/'.\OCP\User::getUser().'/files_external/uploads');
-if (!$view->file_exists('')) {
-	$view->mkdir('');
-}
-
-$isValid = openssl_pkey_get_public($data);
-
-//maybe it was just the wrong file format, try to convert it...
-if ($isValid == false) {
-	$data = chunk_split(base64_encode($data), 64, "\n");
-	$data = "-----BEGIN CERTIFICATE-----\n".$data."-----END CERTIFICATE-----\n";
-	$isValid = openssl_pkey_get_public($data);
-}
-
-// add the certificate if it could be verified
-if ( $isValid ) {
-	// disable proxy to prevent multiple fopen calls
-	$proxyStatus = \OC_FileProxy::$enabled;
-	\OC_FileProxy::$enabled = false;
-	$view->file_put_contents($filename, $data);
-	OC_Mount_Config::createCertificateBundle();
-	\OC_FileProxy::$enabled = $proxyStatus;
-} else {
-	OCP\Util::writeLog('files_external',
-			'Couldn\'t import SSL root certificate ('.$filename.'), allowed formats: PEM and DER',
-			OCP\Util::WARN);
-}
-
-header('Location:' . OCP\Util::linkToRoute( "settings_personal" ));
-exit;
diff --git a/apps/files_external/ajax/removeRootCertificate.php b/apps/files_external/ajax/removeRootCertificate.php
deleted file mode 100644
index 664b3937e97..00000000000
--- a/apps/files_external/ajax/removeRootCertificate.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-OCP\JSON::checkAppEnabled('files_external');
-OCP\JSON::checkLoggedIn();
-OCP\JSON::callCheck();
-
-$view = \OCP\Files::getStorage("files_external");
-$file = 'uploads/'.ltrim($_POST['cert'], "/\\.");
-
-if ( $view->file_exists($file) ) {
-	$view->unlink($file);
-	OC_Mount_Config::createCertificateBundle();
-}