nicoeri/filebrowser
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hotfix: remove unnecessary code

Browse Source
This commit is contained in:
bear0412 2023-07-21 23:08:57 +00:00
parent b6cce0e0e2
commit 76fc60d89f
3 changed files with 48 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
frontend/src/components/settings/Rules.vue
View File

@ -4,15 +4,33 @@
<input type="checkbox" v-model="rule.regex" /><label>Regex</label>
<input type="checkbox" v-model="rule.allow" /><label>Allow</label>
<input @keypress.enter.prevent type="text" style="margin-right: 8px;" v-if="rule.regex" v-model="rule.regexp.raw"
:placeholder="$t('settings.insertRegex')" />
<input @keypress.enter.prevent type="text" style="margin-right: 8px;" v-else v-model="rule.path"
:placeholder="$t('settings.insertPath')" />
<input
@keypress.enter.prevent
type="text"
style="margin-right: 8px"
v-if="rule.regex"
v-model="rule.regexp.raw"
:placeholder="$t('settings.insertRegex')"
/>
<input
@keypress.enter.prevent
type="text"
style="margin-right: 8px"
v-else
v-model="rule.path"
:placeholder="$t('settings.insertPath')"
/>
<input type="checkbox" :checked="rule.perm && rule.perm.includes('read')"
@input="changePermOfRule('read', index)" /><label>Read</label>
<input type="checkbox" :checked="rule.perm && rule.perm.includes('write')"
@input="changePermOfRule('write', index)" /><label>Write</label>
<input
type="checkbox"
:checked="rule.perm && rule.perm.includes('read')"
@input="changePermOfRule('read', index)"
/><label>Read</label>
<input
type="checkbox"
:checked="rule.perm && rule.perm.includes('write')"
@input="changePermOfRule('write', index)"
/><label>Write</label>
<button class="button button--red" @click="remove($event, index)">
-
@ -34,9 +52,17 @@ export default {
methods: {
changePermOfRule(ruleName, index) {
const rule = this.rules[index];
const isRead = ruleName === "read" ? rule.perm.includes("read") : !rule.perm.includes("read");
const isWrite = ruleName === "write" ? rule.perm.includes("write") : !rule.perm.includes("write");
this.rules[index].perm = `${!isRead ? "read" : ""}${!isRead && !isWrite ? "|" : ""}${!isWrite ? "write" : ""}`
const isRead =
ruleName === "read"
? rule.perm.includes("read")
: !rule.perm.includes("read");
const isWrite =
ruleName === "write"
? rule.perm.includes("write")
: !rule.perm.includes("write");
this.rules[index].perm = `${!isRead ? "read" : ""}${
!isRead && !isWrite ? "|" : ""
}${!isWrite ? "write" : ""}`;
},
remove(event, index) {
event.preventDefault();

8
http/data.go
View File

@ -87,9 +87,9 @@ func (d *data) CheckWritePerm(path string) bool {
if rule.Matches(path) {
if !rule.Allow {
write = false
} else {
write = strings.Contains(rule.Perm, "write")
continue
}
write = strings.Contains(rule.Perm, "write")
}
}
@ -97,9 +97,9 @@ func (d *data) CheckWritePerm(path string) bool {
if rule.Matches(path) {
if !rule.Allow {
write = false
} else {
write = strings.Contains(rule.Perm, "write")
continue
}
write = strings.Contains(rule.Perm, "write")
}
}

21
http/resource.go
View File

@ -183,26 +183,19 @@ func resourcePatchHandler(fileCache FileCache) handleFunc {
dst := r.URL.Query().Get("destination")
action := r.URL.Query().Get("action")
dst, err := url.QueryUnescape(dst)
switch action {
case "rename": // rename and move action
if !d.CheckWritePerm(src) || !d.CheckWritePerm(dst) {
return http.StatusForbidden, nil
}
break
case "copy": // copy action
if !d.CheckReadPerm(src) || !d.CheckWritePerm(dst) {
return http.StatusForbidden, nil
}
break
default:
break
}
if err != nil {
return errToStatus(err), err
}
if dst == "/" || src == "/" {
return http.StatusForbidden, nil
}
if !d.CheckReadPerm(src) || !d.CheckWritePerm(dst) {
copy := action == "copy"
rename := action == "rename"
if !rename || !copy {
return http.StatusForbidden, nil
}
}
err = checkParent(src, dst)
if err != nil {