diff options
| author | Joas Schilling <coding@schilljs.com> | 2017-09-22 15:57:56 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-22 15:57:56 +0300 |
| commit | bcca154ad7ff00eeed0b9eb358306ec2f02f308e (patch) | |
| tree | 76da10d82c9c2bea05302c9d165123d2519b266a | |
| parent | 2178468dfd838de0fe77ba9fd2a0afe7074bdbfb (diff) | |
| parent | e7a303830f244a3f5f2979fe1f96c6151b1b836e (diff) | |
Merge pull request #79 from nextcloud/backport-74-check-if-mount-point-property-is-readablev1.2.5
[stable12] Make sure the mountPoint property is public before using it
| -rw-r--r-- | CHANGELOG.md | 21 | ||||
| -rw-r--r-- | appinfo/info.xml | 2 | ||||
| -rw-r--r-- | lib/Operation.php | 15 |
3 files changed, 31 insertions, 7 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index c2079f9..dfc2622 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,14 +1,27 @@ # Changelog All notable changes to this project will be documented in this file. -## 1.2.2 +## 1.2.5 - 2017-09-22 ### Fixed +- Make sure the mountPoint property is public before using it [#79](https://github.com/nextcloud/files_accesscontrol/pull/79) -- Add support for changelog +## 1.2.4 - 2017-05-22 + +### Fixed +- Chinese language file parse error [#63](https://github.com/nextcloud/files_accesscontrol/pull/63) -## 1.2.1 +## 1.2.3 - 2017-05-08 + +### Fixed +- Move to "Files" category in the app store + +## 1.2.2 - 2017-04-26 ### Added +- Add support for changelog -- Added sample screenshots
\ No newline at end of file +## 1.2.1 - 2017-05-22 + +### Added +- Added sample screenshots diff --git a/appinfo/info.xml b/appinfo/info.xml index 324f12e..e3ad8a2 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -6,7 +6,7 @@ <description>Nextcloud's File Access Control app enables administrators to create and manage a set of rule groups. Each of the rule groups consists of one or more rules. If all rules of a group hold true, the group matches the request and access is being denied. The rules criteria range from IP address, to user groups, collaborative tags and some more.</description> <licence>AGPL</licence> <author>Morris Jobke</author> - <version>1.2.4</version> + <version>1.2.5</version> <namespace>FilesAccessControl</namespace> <category>files</category> diff --git a/lib/Operation.php b/lib/Operation.php index c67abaf..94306d3 100644 --- a/lib/Operation.php +++ b/lib/Operation.php @@ -81,8 +81,19 @@ class Operation implements IOperation{ */ protected function isBlockablePath(IStorage $storage, $path) { if (property_exists($storage, 'mountPoint')) { - /** @var StorageWrapper $storage */ - $fullPath = $storage->mountPoint . $path; + $hasMountPoint = $storage instanceof StorageWrapper; + if (!$hasMountPoint) { + $ref = new \ReflectionClass($storage); + $prop = $ref->getProperty('mountPoint'); + $hasMountPoint = $prop->isPublic(); + } + + if ($hasMountPoint) { + /** @var StorageWrapper $storage */ + $fullPath = $storage->mountPoint . $path; + } else { + $fullPath = $path; + } } else { $fullPath = $path; } |