Completed
Push — master ( c65848...a5c801 )
by Blizzz
112:32 queued 99:32
created
lib/private/Encryption/Keys/Storage.php 1 patch
Indentation   +340 added lines, -340 removed lines patch added patch discarded remove patch
@@ -32,345 +32,345 @@
 block discarded – undo
32 32
 
33 33
 class Storage implements IStorage {
34 34
 
35
-	// hidden file which indicate that the folder is a valid key storage
36
-	const KEY_STORAGE_MARKER = '.oc_key_storage';
37
-
38
-	/** @var View */
39
-	private $view;
40
-
41
-	/** @var Util */
42
-	private $util;
43
-
44
-	// base dir where all the file related keys are stored
45
-	/** @var string */
46
-	private $keys_base_dir;
47
-
48
-	// root of the key storage default is empty which means that we use the data folder
49
-	/** @var string */
50
-	private $root_dir;
51
-
52
-	/** @var string */
53
-	private $encryption_base_dir;
54
-
55
-	/** @var string */
56
-	private $backup_base_dir;
57
-
58
-	/** @var array */
59
-	private $keyCache = [];
60
-
61
-	/**
62
-	 * @param View $view
63
-	 * @param Util $util
64
-	 */
65
-	public function __construct(View $view, Util $util) {
66
-		$this->view = $view;
67
-		$this->util = $util;
68
-
69
-		$this->encryption_base_dir = '/files_encryption';
70
-		$this->keys_base_dir = $this->encryption_base_dir .'/keys';
71
-		$this->backup_base_dir = $this->encryption_base_dir .'/backup';
72
-		$this->root_dir = $this->util->getKeyStorageRoot();
73
-	}
74
-
75
-	/**
76
-	 * @inheritdoc
77
-	 */
78
-	public function getUserKey($uid, $keyId, $encryptionModuleId) {
79
-		$path = $this->constructUserKeyPath($encryptionModuleId, $keyId, $uid);
80
-		return $this->getKey($path);
81
-	}
82
-
83
-	/**
84
-	 * @inheritdoc
85
-	 */
86
-	public function getFileKey($path, $keyId, $encryptionModuleId) {
87
-		$realFile = $this->util->stripPartialFileExtension($path);
88
-		$keyDir = $this->getFileKeyDir($encryptionModuleId, $realFile);
89
-		$key = $this->getKey($keyDir . $keyId);
90
-
91
-		if ($key === '' && $realFile !== $path) {
92
-			// Check if the part file has keys and use them, if no normal keys
93
-			// exist. This is required to fix copyBetweenStorage() when we
94
-			// rename a .part file over storage borders.
95
-			$keyDir = $this->getFileKeyDir($encryptionModuleId, $path);
96
-			$key = $this->getKey($keyDir . $keyId);
97
-		}
98
-
99
-		return $key;
100
-	}
101
-
102
-	/**
103
-	 * @inheritdoc
104
-	 */
105
-	public function getSystemUserKey($keyId, $encryptionModuleId) {
106
-		$path = $this->constructUserKeyPath($encryptionModuleId, $keyId, null);
107
-		return $this->getKey($path);
108
-	}
109
-
110
-	/**
111
-	 * @inheritdoc
112
-	 */
113
-	public function setUserKey($uid, $keyId, $key, $encryptionModuleId) {
114
-		$path = $this->constructUserKeyPath($encryptionModuleId, $keyId, $uid);
115
-		return $this->setKey($path, $key);
116
-	}
117
-
118
-	/**
119
-	 * @inheritdoc
120
-	 */
121
-	public function setFileKey($path, $keyId, $key, $encryptionModuleId) {
122
-		$keyDir = $this->getFileKeyDir($encryptionModuleId, $path);
123
-		return $this->setKey($keyDir . $keyId, $key);
124
-	}
125
-
126
-	/**
127
-	 * @inheritdoc
128
-	 */
129
-	public function setSystemUserKey($keyId, $key, $encryptionModuleId) {
130
-		$path = $this->constructUserKeyPath($encryptionModuleId, $keyId, null);
131
-		return $this->setKey($path, $key);
132
-	}
133
-
134
-	/**
135
-	 * @inheritdoc
136
-	 */
137
-	public function deleteUserKey($uid, $keyId, $encryptionModuleId) {
138
-		try {
139
-			$path = $this->constructUserKeyPath($encryptionModuleId, $keyId, $uid);
140
-			return !$this->view->file_exists($path) || $this->view->unlink($path);
141
-		} catch (NoUserException $e) {
142
-			// this exception can come from initMountPoints() from setupUserMounts()
143
-			// for a deleted user.
144
-			//
145
-			// It means, that:
146
-			// - we are not running in alternative storage mode because we don't call
147
-			// initMountPoints() in that mode
148
-			// - the keys were in the user's home but since the user was deleted, the
149
-			// user's home is gone and so are the keys
150
-			//
151
-			// So there is nothing to do, just ignore.
152
-		}
153
-	}
154
-
155
-	/**
156
-	 * @inheritdoc
157
-	 */
158
-	public function deleteFileKey($path, $keyId, $encryptionModuleId) {
159
-		$keyDir = $this->getFileKeyDir($encryptionModuleId, $path);
160
-		return !$this->view->file_exists($keyDir . $keyId) || $this->view->unlink($keyDir . $keyId);
161
-	}
162
-
163
-	/**
164
-	 * @inheritdoc
165
-	 */
166
-	public function deleteAllFileKeys($path) {
167
-		$keyDir = $this->getFileKeyDir('', $path);
168
-		return !$this->view->file_exists($keyDir) || $this->view->deleteAll($keyDir);
169
-	}
170
-
171
-	/**
172
-	 * @inheritdoc
173
-	 */
174
-	public function deleteSystemUserKey($keyId, $encryptionModuleId) {
175
-		$path = $this->constructUserKeyPath($encryptionModuleId, $keyId, null);
176
-		return !$this->view->file_exists($path) || $this->view->unlink($path);
177
-	}
178
-
179
-	/**
180
-	 * construct path to users key
181
-	 *
182
-	 * @param string $encryptionModuleId
183
-	 * @param string $keyId
184
-	 * @param string $uid
185
-	 * @return string
186
-	 */
187
-	protected function constructUserKeyPath($encryptionModuleId, $keyId, $uid) {
188
-
189
-		if ($uid === null) {
190
-			$path = $this->root_dir . '/' . $this->encryption_base_dir . '/' . $encryptionModuleId . '/' . $keyId;
191
-		} else {
192
-			$path = $this->root_dir . '/' . $uid . $this->encryption_base_dir . '/'
193
-				. $encryptionModuleId . '/' . $uid . '.' . $keyId;
194
-		}
195
-
196
-		return \OC\Files\Filesystem::normalizePath($path);
197
-	}
198
-
199
-	/**
200
-	 * read key from hard disk
201
-	 *
202
-	 * @param string $path to key
203
-	 * @return string
204
-	 */
205
-	private function getKey($path) {
206
-
207
-		$key = '';
208
-
209
-		if ($this->view->file_exists($path)) {
210
-			if (isset($this->keyCache[$path])) {
211
-				$key =  $this->keyCache[$path];
212
-			} else {
213
-				$key = $this->view->file_get_contents($path);
214
-				$this->keyCache[$path] = $key;
215
-			}
216
-		}
217
-
218
-		return $key;
219
-	}
220
-
221
-	/**
222
-	 * write key to disk
223
-	 *
224
-	 *
225
-	 * @param string $path path to key directory
226
-	 * @param string $key key
227
-	 * @return bool
228
-	 */
229
-	private function setKey($path, $key) {
230
-		$this->keySetPreparation(dirname($path));
231
-
232
-		$result = $this->view->file_put_contents($path, $key);
233
-
234
-		if (is_int($result) && $result > 0) {
235
-			$this->keyCache[$path] = $key;
236
-			return true;
237
-		}
238
-
239
-		return false;
240
-	}
241
-
242
-	/**
243
-	 * get path to key folder for a given file
244
-	 *
245
-	 * @param string $encryptionModuleId
246
-	 * @param string $path path to the file, relative to data/
247
-	 * @return string
248
-	 */
249
-	private function getFileKeyDir($encryptionModuleId, $path) {
250
-
251
-		list($owner, $filename) = $this->util->getUidAndFilename($path);
252
-
253
-		// in case of system wide mount points the keys are stored directly in the data directory
254
-		if ($this->util->isSystemWideMountPoint($filename, $owner)) {
255
-			$keyPath = $this->root_dir . '/' . $this->keys_base_dir . $filename . '/';
256
-		} else {
257
-			$keyPath = $this->root_dir . '/' . $owner . $this->keys_base_dir . $filename . '/';
258
-		}
259
-
260
-		return Filesystem::normalizePath($keyPath . $encryptionModuleId . '/', false);
261
-	}
262
-
263
-	/**
264
-	 * move keys if a file was renamed
265
-	 *
266
-	 * @param string $source
267
-	 * @param string $target
268
-	 * @return boolean
269
-	 */
270
-	public function renameKeys($source, $target) {
271
-
272
-		$sourcePath = $this->getPathToKeys($source);
273
-		$targetPath = $this->getPathToKeys($target);
274
-
275
-		if ($this->view->file_exists($sourcePath)) {
276
-			$this->keySetPreparation(dirname($targetPath));
277
-			$this->view->rename($sourcePath, $targetPath);
278
-
279
-			return true;
280
-		}
281
-
282
-		return false;
283
-	}
284
-
285
-
286
-	/**
287
-	 * copy keys if a file was renamed
288
-	 *
289
-	 * @param string $source
290
-	 * @param string $target
291
-	 * @return boolean
292
-	 */
293
-	public function copyKeys($source, $target) {
294
-
295
-		$sourcePath = $this->getPathToKeys($source);
296
-		$targetPath = $this->getPathToKeys($target);
297
-
298
-		if ($this->view->file_exists($sourcePath)) {
299
-			$this->keySetPreparation(dirname($targetPath));
300
-			$this->view->copy($sourcePath, $targetPath);
301
-			return true;
302
-		}
303
-
304
-		return false;
305
-	}
306
-
307
-	/**
308
-	 * backup keys of a given encryption module
309
-	 *
310
-	 * @param string $encryptionModuleId
311
-	 * @param string $purpose
312
-	 * @param string $uid
313
-	 * @return bool
314
-	 * @since 12.0.0
315
-	 */
316
-	public function backupUserKeys($encryptionModuleId, $purpose, $uid) {
317
-		$source = $uid . $this->encryption_base_dir . '/' . $encryptionModuleId;
318
-		$backupDir = $uid . $this->backup_base_dir;
319
-		if (!$this->view->file_exists($backupDir)) {
320
-			$this->view->mkdir($backupDir);
321
-		}
322
-
323
-		$backupDir = $backupDir . '/' . $purpose . '.' . $encryptionModuleId . '.' . $this->getTimestamp();
324
-		$this->view->mkdir($backupDir);
325
-
326
-		return $this->view->copy($source, $backupDir);
327
-	}
328
-
329
-	/**
330
-	 * get the current timestamp
331
-	 *
332
-	 * @return int
333
-	 */
334
-	protected function getTimestamp() {
335
-		return time();
336
-	}
337
-
338
-	/**
339
-	 * get system wide path and detect mount points
340
-	 *
341
-	 * @param string $path
342
-	 * @return string
343
-	 */
344
-	protected function getPathToKeys($path) {
345
-		list($owner, $relativePath) = $this->util->getUidAndFilename($path);
346
-		$systemWideMountPoint = $this->util->isSystemWideMountPoint($relativePath, $owner);
347
-
348
-		if ($systemWideMountPoint) {
349
-			$systemPath = $this->root_dir . '/' . $this->keys_base_dir . $relativePath . '/';
350
-		} else {
351
-			$systemPath = $this->root_dir . '/' . $owner . $this->keys_base_dir . $relativePath . '/';
352
-		}
353
-
354
-		return  Filesystem::normalizePath($systemPath, false);
355
-	}
356
-
357
-	/**
358
-	 * Make preparations to filesystem for saving a key file
359
-	 *
360
-	 * @param string $path relative to the views root
361
-	 */
362
-	protected function keySetPreparation($path) {
363
-		// If the file resides within a subdirectory, create it
364
-		if (!$this->view->file_exists($path)) {
365
-			$sub_dirs = explode('/', ltrim($path, '/'));
366
-			$dir = '';
367
-			foreach ($sub_dirs as $sub_dir) {
368
-				$dir .= '/' . $sub_dir;
369
-				if (!$this->view->is_dir($dir)) {
370
-					$this->view->mkdir($dir);
371
-				}
372
-			}
373
-		}
374
-	}
35
+    // hidden file which indicate that the folder is a valid key storage
36
+    const KEY_STORAGE_MARKER = '.oc_key_storage';
37
+
38
+    /** @var View */
39
+    private $view;
40
+
41
+    /** @var Util */
42
+    private $util;
43
+
44
+    // base dir where all the file related keys are stored
45
+    /** @var string */
46
+    private $keys_base_dir;
47
+
48
+    // root of the key storage default is empty which means that we use the data folder
49
+    /** @var string */
50
+    private $root_dir;
51
+
52
+    /** @var string */
53
+    private $encryption_base_dir;
54
+
55
+    /** @var string */
56
+    private $backup_base_dir;
57
+
58
+    /** @var array */
59
+    private $keyCache = [];
60
+
61
+    /**
62
+     * @param View $view
63
+     * @param Util $util
64
+     */
65
+    public function __construct(View $view, Util $util) {
66
+        $this->view = $view;
67
+        $this->util = $util;
68
+
69
+        $this->encryption_base_dir = '/files_encryption';
70
+        $this->keys_base_dir = $this->encryption_base_dir .'/keys';
71
+        $this->backup_base_dir = $this->encryption_base_dir .'/backup';
72
+        $this->root_dir = $this->util->getKeyStorageRoot();
73
+    }
74
+
75
+    /**
76
+     * @inheritdoc
77
+     */
78
+    public function getUserKey($uid, $keyId, $encryptionModuleId) {
79
+        $path = $this->constructUserKeyPath($encryptionModuleId, $keyId, $uid);
80
+        return $this->getKey($path);
81
+    }
82
+
83
+    /**
84
+     * @inheritdoc
85
+     */
86
+    public function getFileKey($path, $keyId, $encryptionModuleId) {
87
+        $realFile = $this->util->stripPartialFileExtension($path);
88
+        $keyDir = $this->getFileKeyDir($encryptionModuleId, $realFile);
89
+        $key = $this->getKey($keyDir . $keyId);
90
+
91
+        if ($key === '' && $realFile !== $path) {
92
+            // Check if the part file has keys and use them, if no normal keys
93
+            // exist. This is required to fix copyBetweenStorage() when we
94
+            // rename a .part file over storage borders.
95
+            $keyDir = $this->getFileKeyDir($encryptionModuleId, $path);
96
+            $key = $this->getKey($keyDir . $keyId);
97
+        }
98
+
99
+        return $key;
100
+    }
101
+
102
+    /**
103
+     * @inheritdoc
104
+     */
105
+    public function getSystemUserKey($keyId, $encryptionModuleId) {
106
+        $path = $this->constructUserKeyPath($encryptionModuleId, $keyId, null);
107
+        return $this->getKey($path);
108
+    }
109
+
110
+    /**
111
+     * @inheritdoc
112
+     */
113
+    public function setUserKey($uid, $keyId, $key, $encryptionModuleId) {
114
+        $path = $this->constructUserKeyPath($encryptionModuleId, $keyId, $uid);
115
+        return $this->setKey($path, $key);
116
+    }
117
+
118
+    /**
119
+     * @inheritdoc
120
+     */
121
+    public function setFileKey($path, $keyId, $key, $encryptionModuleId) {
122
+        $keyDir = $this->getFileKeyDir($encryptionModuleId, $path);
123
+        return $this->setKey($keyDir . $keyId, $key);
124
+    }
125
+
126
+    /**
127
+     * @inheritdoc
128
+     */
129
+    public function setSystemUserKey($keyId, $key, $encryptionModuleId) {
130
+        $path = $this->constructUserKeyPath($encryptionModuleId, $keyId, null);
131
+        return $this->setKey($path, $key);
132
+    }
133
+
134
+    /**
135
+     * @inheritdoc
136
+     */
137
+    public function deleteUserKey($uid, $keyId, $encryptionModuleId) {
138
+        try {
139
+            $path = $this->constructUserKeyPath($encryptionModuleId, $keyId, $uid);
140
+            return !$this->view->file_exists($path) || $this->view->unlink($path);
141
+        } catch (NoUserException $e) {
142
+            // this exception can come from initMountPoints() from setupUserMounts()
143
+            // for a deleted user.
144
+            //
145
+            // It means, that:
146
+            // - we are not running in alternative storage mode because we don't call
147
+            // initMountPoints() in that mode
148
+            // - the keys were in the user's home but since the user was deleted, the
149
+            // user's home is gone and so are the keys
150
+            //
151
+            // So there is nothing to do, just ignore.
152
+        }
153
+    }
154
+
155
+    /**
156
+     * @inheritdoc
157
+     */
158
+    public function deleteFileKey($path, $keyId, $encryptionModuleId) {
159
+        $keyDir = $this->getFileKeyDir($encryptionModuleId, $path);
160
+        return !$this->view->file_exists($keyDir . $keyId) || $this->view->unlink($keyDir . $keyId);
161
+    }
162
+
163
+    /**
164
+     * @inheritdoc
165
+     */
166
+    public function deleteAllFileKeys($path) {
167
+        $keyDir = $this->getFileKeyDir('', $path);
168
+        return !$this->view->file_exists($keyDir) || $this->view->deleteAll($keyDir);
169
+    }
170
+
171
+    /**
172
+     * @inheritdoc
173
+     */
174
+    public function deleteSystemUserKey($keyId, $encryptionModuleId) {
175
+        $path = $this->constructUserKeyPath($encryptionModuleId, $keyId, null);
176
+        return !$this->view->file_exists($path) || $this->view->unlink($path);
177
+    }
178
+
179
+    /**
180
+     * construct path to users key
181
+     *
182
+     * @param string $encryptionModuleId
183
+     * @param string $keyId
184
+     * @param string $uid
185
+     * @return string
186
+     */
187
+    protected function constructUserKeyPath($encryptionModuleId, $keyId, $uid) {
188
+
189
+        if ($uid === null) {
190
+            $path = $this->root_dir . '/' . $this->encryption_base_dir . '/' . $encryptionModuleId . '/' . $keyId;
191
+        } else {
192
+            $path = $this->root_dir . '/' . $uid . $this->encryption_base_dir . '/'
193
+                . $encryptionModuleId . '/' . $uid . '.' . $keyId;
194
+        }
195
+
196
+        return \OC\Files\Filesystem::normalizePath($path);
197
+    }
198
+
199
+    /**
200
+     * read key from hard disk
201
+     *
202
+     * @param string $path to key
203
+     * @return string
204
+     */
205
+    private function getKey($path) {
206
+
207
+        $key = '';
208
+
209
+        if ($this->view->file_exists($path)) {
210
+            if (isset($this->keyCache[$path])) {
211
+                $key =  $this->keyCache[$path];
212
+            } else {
213
+                $key = $this->view->file_get_contents($path);
214
+                $this->keyCache[$path] = $key;
215
+            }
216
+        }
217
+
218
+        return $key;
219
+    }
220
+
221
+    /**
222
+     * write key to disk
223
+     *
224
+     *
225
+     * @param string $path path to key directory
226
+     * @param string $key key
227
+     * @return bool
228
+     */
229
+    private function setKey($path, $key) {
230
+        $this->keySetPreparation(dirname($path));
231
+
232
+        $result = $this->view->file_put_contents($path, $key);
233
+
234
+        if (is_int($result) && $result > 0) {
235
+            $this->keyCache[$path] = $key;
236
+            return true;
237
+        }
238
+
239
+        return false;
240
+    }
241
+
242
+    /**
243
+     * get path to key folder for a given file
244
+     *
245
+     * @param string $encryptionModuleId
246
+     * @param string $path path to the file, relative to data/
247
+     * @return string
248
+     */
249
+    private function getFileKeyDir($encryptionModuleId, $path) {
250
+
251
+        list($owner, $filename) = $this->util->getUidAndFilename($path);
252
+
253
+        // in case of system wide mount points the keys are stored directly in the data directory
254
+        if ($this->util->isSystemWideMountPoint($filename, $owner)) {
255
+            $keyPath = $this->root_dir . '/' . $this->keys_base_dir . $filename . '/';
256
+        } else {
257
+            $keyPath = $this->root_dir . '/' . $owner . $this->keys_base_dir . $filename . '/';
258
+        }
259
+
260
+        return Filesystem::normalizePath($keyPath . $encryptionModuleId . '/', false);
261
+    }
262
+
263
+    /**
264
+     * move keys if a file was renamed
265
+     *
266
+     * @param string $source
267
+     * @param string $target
268
+     * @return boolean
269
+     */
270
+    public function renameKeys($source, $target) {
271
+
272
+        $sourcePath = $this->getPathToKeys($source);
273
+        $targetPath = $this->getPathToKeys($target);
274
+
275
+        if ($this->view->file_exists($sourcePath)) {
276
+            $this->keySetPreparation(dirname($targetPath));
277
+            $this->view->rename($sourcePath, $targetPath);
278
+
279
+            return true;
280
+        }
281
+
282
+        return false;
283
+    }
284
+
285
+
286
+    /**
287
+     * copy keys if a file was renamed
288
+     *
289
+     * @param string $source
290
+     * @param string $target
291
+     * @return boolean
292
+     */
293
+    public function copyKeys($source, $target) {
294
+
295
+        $sourcePath = $this->getPathToKeys($source);
296
+        $targetPath = $this->getPathToKeys($target);
297
+
298
+        if ($this->view->file_exists($sourcePath)) {
299
+            $this->keySetPreparation(dirname($targetPath));
300
+            $this->view->copy($sourcePath, $targetPath);
301
+            return true;
302
+        }
303
+
304
+        return false;
305
+    }
306
+
307
+    /**
308
+     * backup keys of a given encryption module
309
+     *
310
+     * @param string $encryptionModuleId
311
+     * @param string $purpose
312
+     * @param string $uid
313
+     * @return bool
314
+     * @since 12.0.0
315
+     */
316
+    public function backupUserKeys($encryptionModuleId, $purpose, $uid) {
317
+        $source = $uid . $this->encryption_base_dir . '/' . $encryptionModuleId;
318
+        $backupDir = $uid . $this->backup_base_dir;
319
+        if (!$this->view->file_exists($backupDir)) {
320
+            $this->view->mkdir($backupDir);
321
+        }
322
+
323
+        $backupDir = $backupDir . '/' . $purpose . '.' . $encryptionModuleId . '.' . $this->getTimestamp();
324
+        $this->view->mkdir($backupDir);
325
+
326
+        return $this->view->copy($source, $backupDir);
327
+    }
328
+
329
+    /**
330
+     * get the current timestamp
331
+     *
332
+     * @return int
333
+     */
334
+    protected function getTimestamp() {
335
+        return time();
336
+    }
337
+
338
+    /**
339
+     * get system wide path and detect mount points
340
+     *
341
+     * @param string $path
342
+     * @return string
343
+     */
344
+    protected function getPathToKeys($path) {
345
+        list($owner, $relativePath) = $this->util->getUidAndFilename($path);
346
+        $systemWideMountPoint = $this->util->isSystemWideMountPoint($relativePath, $owner);
347
+
348
+        if ($systemWideMountPoint) {
349
+            $systemPath = $this->root_dir . '/' . $this->keys_base_dir . $relativePath . '/';
350
+        } else {
351
+            $systemPath = $this->root_dir . '/' . $owner . $this->keys_base_dir . $relativePath . '/';
352
+        }
353
+
354
+        return  Filesystem::normalizePath($systemPath, false);
355
+    }
356
+
357
+    /**
358
+     * Make preparations to filesystem for saving a key file
359
+     *
360
+     * @param string $path relative to the views root
361
+     */
362
+    protected function keySetPreparation($path) {
363
+        // If the file resides within a subdirectory, create it
364
+        if (!$this->view->file_exists($path)) {
365
+            $sub_dirs = explode('/', ltrim($path, '/'));
366
+            $dir = '';
367
+            foreach ($sub_dirs as $sub_dir) {
368
+                $dir .= '/' . $sub_dir;
369
+                if (!$this->view->is_dir($dir)) {
370
+                    $this->view->mkdir($dir);
371
+                }
372
+            }
373
+        }
374
+    }
375 375
 
376 376
 }
Please login to merge, or discard this patch.