Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve iCloud path checking #9066

Merged
merged 2 commits into from
Aug 29, 2023
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 24 additions & 8 deletions app/electron/init.html
Original file line number Diff line number Diff line change
Expand Up @@ -421,17 +421,32 @@ <h2>SiYuan</h2>

// macOS 端对工作空间放置在 iCloud 路径下做检查 https://github.com/siyuan-note/siyuan/issues/7747
const path = require('path')
const iCloudRoot = path.join(decodeURIComponent(getSearch('home')), 'Library', 'Mobile Documents')
const allFiles = walk(iCloudRoot)
const homePath = decodeURIComponent(getSearch('home'))
const absPathLower = absPath.toLowerCase()
for (const file of allFiles) {
if (-1 < absPathLower.indexOf(file.toLowerCase())) {
return true
const iCloudRoot = path.join(homePath, 'Library', 'Mobile Documents')
//进行简单判断文件路径
if(!simpleCheckPath(absPath, iCloudRoot)){
AnonymousMister marked this conversation as resolved.
Show resolved Hide resolved
//简单判断无法通过则复杂验证
const allFiles = walk(iCloudRoot)
for (const file of allFiles) {
if (-1 < absPathLower.indexOf(file.toLowerCase())) {
return true
}
}
}
}
return false
}
const simpleCheckPath =(path, iCloudRoot)=>{
const fs = require('fs')
let stat = fs.lstatSync(path)
if(stat.isSymbolicLink()){
// 不允许目标路径是软链 或者硬链接
return false
}
const absPathLower = path.toLowerCase()
return !(-1 < absPathLower.indexOf(iCloudRoot.toLowerCase()))

}
const walk = (dir, files = []) => {
let dirFiles;
const fs = require('fs')
Expand All @@ -440,7 +455,6 @@ <h2>SiYuan</h2>
console.log("dir [" + dir + "] not exists")
return files
}

dirFiles = fs.readdirSync(dir)
} catch (e) {
console.error("read dir [" + dir + "] failed: ", e)
Expand All @@ -459,9 +473,11 @@ <h2>SiYuan</h2>
if (files.includes(dir + path.sep + f)) {
continue
}
files.push(dir + path.sep + f)
walk(dir + path.sep + f, files)
} else {
files.push(dir + path.sep + f)
//不在添加文件到过滤路径 最小细粒度为目录
//files.push(dir + path.sep + f)
AnonymousMister marked this conversation as resolved.
Show resolved Hide resolved
}
}
return files
Expand Down
Loading