← All changes | app/Services/Libs/FileSystem.php +71 -2 2.0.4 → trunk View file →

		@@ -63,8 +63,78 @@
63	63	return $this->_getDir() . DIRECTORY_SEPARATOR . $file;
64	64	}
65	65
66	66	/**
	67	+ * Resolve a stored attachment path only when it belongs to Fluent Boards uploads.
	68	+ *
	69	+ * @param string $storedPath
	70	+ * @param int|null $boardId
	71	+ * @return string|null
	72	+ */
	73	+ public function _resolveLocalAttachmentPath($storedPath, $boardId = null)
	74	+ {
	75	+ if (!$storedPath) {
	76	+ return null;
	77	+ }
	78	+
	79	+ $storedFilename = rawurldecode((string) $storedPath);
	80	+ $isBareFilename = $storedFilename !== ''
	81	+ && strpos($storedFilename, '/') === false
	82	+ && strpos($storedFilename, '\\') === false;
	83	+
	84	+ if ($isBareFilename && $boardId === null) {
	85	+ return null;
	86	+ }
	87	+
	88	+ $filePath = $isBareFilename ? null : realpath($storedPath);
	89	+ $allowedDirectory = $this->_getDir();
	90	+ $pluginRoot = realpath($allowedDirectory);
	91	+
	92	+ if (!$pluginRoot) {
	93	+ return null;
	94	+ }
	95	+
	96	+ $pluginRoot = rtrim($pluginRoot, DIRECTORY_SEPARATOR);
	97	+ $allowedRoot = $pluginRoot;
	98	+
	99	+ if ($boardId !== null) {
	100	+ if (!is_int($boardId) && !is_string($boardId)) {
	101	+ return null;
	102	+ }
	103	+
	104	+ $boardId = filter_var($boardId, FILTER_VALIDATE_INT, [
	105	+ 'options' => ['min_range' => 1],
	106	+ ]);
	107	+ if ($boardId === false) {
	108	+ return null;
	109	+ }
	110	+
	111	+ $allowedDirectory .= DIRECTORY_SEPARATOR . 'board_' . $boardId;
	112	+ if (is_link($allowedDirectory)) {
	113	+ return null;
	114	+ }
	115	+
	116	+ $allowedRoot = realpath($allowedDirectory);
	117	+ $expectedBoardRoot = $pluginRoot . DIRECTORY_SEPARATOR . 'board_' . $boardId;
	118	+ if (!$allowedRoot || $allowedRoot !== $expectedBoardRoot) {
	119	+ return null;
	120	+ }
	121	+ }
	122	+
	123	+ if ($isBareFilename) {
	124	+ $filePath = realpath($allowedDirectory . DIRECTORY_SEPARATOR . $storedFilename);
	125	+ }
	126	+
	127	+ if (!$filePath || !$allowedRoot || !is_file($filePath)) {
	128	+ return null;
	129	+ }
	130	+
	131	+ $allowedRoot = rtrim($allowedRoot, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
	132	+
	133	+ return strpos($filePath, $allowedRoot) === 0 ? $filePath : null;
	134	+ }
	135	+
	136	+ /**
67	137	* Upload files into custom upload dir of this application
68	138	* @return array
69	139	*/
70	140	public function _uploadFromRequest()
		@@ -182,10 +252,9 @@
182	252	* @return array $file
183	253	*/
184	254	public function _renameFileName($file)
185	255	{
186		- $currentTimeStamp = (new \DateTimeImmutable())->getTimestamp();
187		- $prefix = $currentTimeStamp . '-';
	256	+ $prefix = wp_generate_uuid4() . '-';
188	257	$prefix = apply_filters('fluent_boards/uploaded_file_name_prefix', $prefix);
189	258	$file['name'] = $prefix . $file['name'];
190	259
191	260	return $file;