Signed-off-by: Robin Appelman <robin@icewind.nl>pull/3297/head
Robin Appelman
9 years ago
parent
1a591cea97
commit
fa49c4a13b
@ -0,0 +1,74 @@ |
||||
<?php |
||||
/** |
||||
* @copyright Copyright (c) 2017, Robin Appelman <robin@icewind.nl> |
||||
* |
||||
* This code is free software: you can redistribute it and/or modify |
||||
* it under the terms of the GNU Affero General Public License, version 3, |
||||
* as published by the Free Software Foundation. |
||||
* |
||||
* This program is distributed in the hope that it will be useful, |
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
||||
* GNU Affero General Public License for more details. |
||||
* |
||||
* You should have received a copy of the GNU Affero General Public License, version 3, |
||||
* along with this program. If not, see <http://www.gnu.org/licenses/> |
||||
* |
||||
*/ |
||||
|
||||
namespace OC\Federation; |
||||
|
||||
use OCP\Federation\ICloudId; |
||||
|
||||
class CloudId implements ICloudId { |
||||
/** @var string */ |
||||
private $id; |
||||
/** @var string */ |
||||
private $user; |
||||
/** @var string */ |
||||
private $remote; |
||||
|
||||
/** |
||||
* CloudId constructor. |
||||
* |
||||
* @param string $id |
||||
* @param string $user |
||||
* @param string $remote |
||||
*/ |
||||
public function __construct($id, $user, $remote) { |
||||
$this->id = $id; |
||||
$this->user = $user; |
||||
$this->remote = $remote; |
||||
} |
||||
|
||||
/** |
||||
* The full remote cloud id |
||||
* |
||||
* @return string |
||||
*/ |
||||
public function getId() { |
||||
return $this->id; |
||||
} |
||||
|
||||
public function getDisplayId() { |
||||
return str_replace('https://', '', str_replace('http://', '', $this->getId())); |
||||
} |
||||
|
||||
/** |
||||
* The username on the remote server |
||||
* |
||||
* @return string |
||||
*/ |
||||
public function getUser() { |
||||
return $this->user; |
||||
} |
||||
|
||||
/** |
||||
* The base address of the remote server |
||||
* |
||||
* @return string |
||||
*/ |
||||
public function getRemote() { |
||||
return $this->remote; |
||||
} |
||||
} |
||||
@ -0,0 +1,108 @@ |
||||
<?php |
||||
/** |
||||
* @copyright Copyright (c) 2017, Robin Appelman <robin@icewind.nl> |
||||
* |
||||
* This code is free software: you can redistribute it and/or modify |
||||
* it under the terms of the GNU Affero General Public License, version 3, |
||||
* as published by the Free Software Foundation. |
||||
* |
||||
* This program is distributed in the hope that it will be useful, |
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
||||
* GNU Affero General Public License for more details. |
||||
* |
||||
* You should have received a copy of the GNU Affero General Public License, version 3, |
||||
* along with this program. If not, see <http://www.gnu.org/licenses/> |
||||
* |
||||
*/ |
||||
|
||||
namespace OC\Federation; |
||||
|
||||
use OCP\Federation\ICloudId; |
||||
use OCP\Federation\ICloudIdManager; |
||||
|
||||
class CloudIdManager implements ICloudIdManager { |
||||
/** |
||||
* @param string $cloudId |
||||
* @return ICloudId |
||||
*/ |
||||
public function resolveCloudId($cloudId) { |
||||
// TODO magic here to get the url and user instead of just splitting on @ |
||||
|
||||
if (!$this->isValidCloudId($cloudId)) { |
||||
throw new \InvalidArgumentException('Invalid cloud id'); |
||||
} |
||||
|
||||
// Find the first character that is not allowed in user names |
||||
$id = str_replace('\\', '/', $cloudId); |
||||
$posSlash = strpos($id, '/'); |
||||
$posColon = strpos($id, ':'); |
||||
|
||||
if ($posSlash === false && $posColon === false) { |
||||
$invalidPos = strlen($id); |
||||
} else if ($posSlash === false) { |
||||
$invalidPos = $posColon; |
||||
} else if ($posColon === false) { |
||||
$invalidPos = $posSlash; |
||||
} else { |
||||
$invalidPos = min($posSlash, $posColon); |
||||
} |
||||
|
||||
// Find the last @ before $invalidPos |
||||
$pos = $lastAtPos = 0; |
||||
while ($lastAtPos !== false && $lastAtPos <= $invalidPos) { |
||||
$pos = $lastAtPos; |
||||
$lastAtPos = strpos($id, '@', $pos + 1); |
||||
} |
||||
|
||||
if ($pos !== false) { |
||||
$user = substr($id, 0, $pos); |
||||
$remote = substr($id, $pos + 1); |
||||
$remote = $this->fixRemoteURL($remote); |
||||
if (!empty($user) && !empty($remote)) { |
||||
return new CloudId($cloudId, $user, $remote); |
||||
} |
||||
} |
||||
throw new \InvalidArgumentException('Invalid cloud id'); |
||||
} |
||||
|
||||
/** |
||||
* @param string $user |
||||
* @param string $remote |
||||
* @return CloudId |
||||
*/ |
||||
public function getCloudId($user, $remote) { |
||||
// TODO check what the correct url is for remote (asking the remote) |
||||
return new CloudId($user. '@' . $remote, $user, $remote); |
||||
} |
||||
|
||||
/** |
||||
* Strips away a potential file names and trailing slashes: |
||||
* - http://localhost |
||||
* - http://localhost/ |
||||
* - http://localhost/index.php |
||||
* - http://localhost/index.php/s/{shareToken} |
||||
* |
||||
* all return: http://localhost |
||||
* |
||||
* @param string $remote |
||||
* @return string |
||||
*/ |
||||
protected function fixRemoteURL($remote) { |
||||
$remote = str_replace('\\', '/', $remote); |
||||
if ($fileNamePosition = strpos($remote, '/index.php')) { |
||||
$remote = substr($remote, 0, $fileNamePosition); |
||||
} |
||||
$remote = rtrim($remote, '/'); |
||||
|
||||
return $remote; |
||||
} |
||||
|
||||
/** |
||||
* @param string $cloudId |
||||
* @return bool |
||||
*/ |
||||
public function isValidCloudId($cloudId) { |
||||
return strpos($cloudId, '@') !== false; |
||||
} |
||||
} |
||||
@ -0,0 +1,58 @@ |
||||
<?php |
||||
/** |
||||
* @copyright Copyright (c) 2017, Robin Appelman <robin@icewind.nl> |
||||
* |
||||
* This code is free software: you can redistribute it and/or modify |
||||
* it under the terms of the GNU Affero General Public License, version 3, |
||||
* as published by the Free Software Foundation. |
||||
* |
||||
* This program is distributed in the hope that it will be useful, |
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
||||
* GNU Affero General Public License for more details. |
||||
* |
||||
* You should have received a copy of the GNU Affero General Public License, version 3, |
||||
* along with this program. If not, see <http://www.gnu.org/licenses/> |
||||
* |
||||
*/ |
||||
|
||||
namespace OCP\Federation; |
||||
|
||||
/** |
||||
* Parsed federated cloud id |
||||
* |
||||
* @since 12.0.0 |
||||
*/ |
||||
interface ICloudId { |
||||
/** |
||||
* The remote cloud id |
||||
* |
||||
* @return string |
||||
* @since 12.0.0 |
||||
*/ |
||||
public function getId(); |
||||
|
||||
/** |
||||
* Get a clean representation of the cloud id for display |
||||
* |
||||
* @return string |
||||
* @since 12.0.0 |
||||
*/ |
||||
public function getDisplayId(); |
||||
|
||||
/** |
||||
* The username on the remote server |
||||
* |
||||
* @return string |
||||
* @since 12.0.0 |
||||
*/ |
||||
public function getUser(); |
||||
|
||||
/** |
||||
* The base address of the remote server |
||||
* |
||||
* @return string |
||||
* @since 12.0.0 |
||||
*/ |
||||
public function getRemote(); |
||||
} |
||||
@ -0,0 +1,55 @@ |
||||
<?php |
||||
/** |
||||
* @copyright Copyright (c) 2017, Robin Appelman <robin@icewind.nl> |
||||
* |
||||
* This code is free software: you can redistribute it and/or modify |
||||
* it under the terms of the GNU Affero General Public License, version 3, |
||||
* as published by the Free Software Foundation. |
||||
* |
||||
* This program is distributed in the hope that it will be useful, |
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
||||
* GNU Affero General Public License for more details. |
||||
* |
||||
* You should have received a copy of the GNU Affero General Public License, version 3, |
||||
* along with this program. If not, see <http://www.gnu.org/licenses/> |
||||
* |
||||
*/ |
||||
|
||||
namespace OCP\Federation; |
||||
|
||||
/** |
||||
* Interface for resolving federated cloud ids |
||||
* |
||||
* @since 12.0.0 |
||||
*/ |
||||
interface ICloudIdManager { |
||||
/** |
||||
* @param string $cloudId |
||||
* @return ICloudId |
||||
* |
||||
* @since 12.0.0 |
||||
*/ |
||||
public function resolveCloudId($cloudId); |
||||
|
||||
/** |
||||
* Get the cloud id for a remote user |
||||
* |
||||
* @param string $user |
||||
* @param string $remote |
||||
* @return ICloudId |
||||
* |
||||
* @since 12.0.0 |
||||
*/ |
||||
public function getCloudId($user, $remote); |
||||
|
||||
/** |
||||
* Check if the input is a correctly formatted cloud id |
||||
* |
||||
* @param string $cloudId |
||||
* @return bool |
||||
* |
||||
* @since 12.0.0 |
||||
*/ |
||||
public function isValidCloudId($cloudId); |
||||
} |
||||
Loading…
Reference in new issue