mirror of
https://github.com/siyuan-note/siyuan.git
synced 2025-12-16 22:50:13 +01:00
🎨 Support one-click addition of Microsoft Defender exclusions https://github.com/siyuan-note/siyuan/issues/13650
This commit is contained in:
parent
10d5d4f6a1
commit
e6ecfc5cbb
8 changed files with 103 additions and 1 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -1,5 +1,6 @@
|
||||||
# Binaries for programs and plugins
|
# Binaries for programs and plugins
|
||||||
*.exe
|
*.exe
|
||||||
|
!app/elevator/elevator-*.exe
|
||||||
*.dll
|
*.dll
|
||||||
*.so
|
*.so
|
||||||
*.dylib
|
*.dylib
|
||||||
|
|
|
||||||
|
|
@ -69,4 +69,6 @@ extraResources:
|
||||||
filter: "!**/{.DS_Store,custom.css}"
|
filter: "!**/{.DS_Store,custom.css}"
|
||||||
- from: "src/assets/fonts"
|
- from: "src/assets/fonts"
|
||||||
to: "appearance/fonts"
|
to: "appearance/fonts"
|
||||||
filter: "!**/{.DS_Store}"
|
filter: "!**/{.DS_Store}"
|
||||||
|
- from: "elevator/elevator-arm64.exe"
|
||||||
|
to: "elevator.exe"
|
||||||
|
|
@ -71,3 +71,5 @@ extraResources:
|
||||||
filter: "!**/{.DS_Store}"
|
filter: "!**/{.DS_Store}"
|
||||||
- from: "pandoc/pandoc-windows-amd64.zip"
|
- from: "pandoc/pandoc-windows-amd64.zip"
|
||||||
to: "pandoc.zip"
|
to: "pandoc.zip"
|
||||||
|
- from: "elevator/elevator-amd64.exe"
|
||||||
|
to: "elevator.exe"
|
||||||
|
|
|
||||||
1
app/elevator/README
Normal file
1
app/elevator/README
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
https://github.com/siyuan-note/elevator
|
||||||
BIN
app/elevator/elevator-amd64.exe
Normal file
BIN
app/elevator/elevator-amd64.exe
Normal file
Binary file not shown.
BIN
app/elevator/elevator-arm64.exe
Normal file
BIN
app/elevator/elevator-arm64.exe
Normal file
Binary file not shown.
|
|
@ -45,6 +45,8 @@ type System struct {
|
||||||
LockScreenMode int `json:"lockScreenMode"` // 0:手动,1:手动+跟随系统 https://github.com/siyuan-note/siyuan/issues/9087
|
LockScreenMode int `json:"lockScreenMode"` // 0:手动,1:手动+跟随系统 https://github.com/siyuan-note/siyuan/issues/9087
|
||||||
|
|
||||||
DisabledFeatures []string `json:"disabledFeatures"`
|
DisabledFeatures []string `json:"disabledFeatures"`
|
||||||
|
|
||||||
|
MicrosoftDefenderExcluded bool `json:"microsoftDefenderExcluded"` // 是否已加入 Microsoft Defender 排除项 https://github.com/siyuan-note/siyuan/issues/13650
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewSystem() *System {
|
func NewSystem() *System {
|
||||||
|
|
|
||||||
94
kernel/model/elevator.go
Normal file
94
kernel/model/elevator.go
Normal file
|
|
@ -0,0 +1,94 @@
|
||||||
|
// SiYuan - Refactor your thinking
|
||||||
|
// Copyright (c) 2020-present, b3log.org
|
||||||
|
//
|
||||||
|
// This program is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU Affero General Public License as published by
|
||||||
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
|
// (at your option) any later version.
|
||||||
|
//
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU Affero General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU Affero General Public License
|
||||||
|
// along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
package model
|
||||||
|
|
||||||
|
import (
|
||||||
|
"github.com/siyuan-note/logging"
|
||||||
|
"github.com/siyuan-note/siyuan/kernel/util"
|
||||||
|
"golang.org/x/sys/windows"
|
||||||
|
"os"
|
||||||
|
"os/exec"
|
||||||
|
"path/filepath"
|
||||||
|
"runtime"
|
||||||
|
"strings"
|
||||||
|
"syscall"
|
||||||
|
|
||||||
|
"github.com/88250/gulu"
|
||||||
|
)
|
||||||
|
|
||||||
|
func processMicrosoftDefender() {
|
||||||
|
if !gulu.OS.IsWindows() || Conf.System.MicrosoftDefenderExcluded {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
elevator := filepath.Join(util.WorkingDir, "elevator.exe")
|
||||||
|
if "dev" == util.Mode || !gulu.File.IsExist(elevator) {
|
||||||
|
elevator = filepath.Join(util.WorkingDir, "elevator", "elevator-"+runtime.GOARCH+".exe")
|
||||||
|
}
|
||||||
|
|
||||||
|
if !gulu.File.IsExist(elevator) {
|
||||||
|
logging.LogWarnf("not found elevator [%s]", elevator)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if !isUsingMicrosoftDefender() {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
installPath := filepath.Dir(util.WorkingDir)
|
||||||
|
|
||||||
|
if isAdmin() {
|
||||||
|
cmd := exec.Command("powershell", "-Command", "Add-MpPreference", "-ExclusionPath", installPath, ",", util.WorkspaceDir)
|
||||||
|
gulu.CmdAttr(cmd)
|
||||||
|
output, err := cmd.CombinedOutput()
|
||||||
|
if nil != err {
|
||||||
|
logging.LogErrorf("add Windows Defender exclusion path [%s] failed: %s, %s", installPath, err, string(output))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
cwd, _ := os.Getwd()
|
||||||
|
args := strings.Join([]string{"powershell", "-Command", "Add-MpPreference", "-ExclusionPath", installPath, ",", util.WorkspaceDir}, " ")
|
||||||
|
verbPtr, _ := syscall.UTF16PtrFromString("runas")
|
||||||
|
exePtr, _ := syscall.UTF16PtrFromString(elevator)
|
||||||
|
cwdPtr, _ := syscall.UTF16PtrFromString(cwd)
|
||||||
|
argPtr, _ := syscall.UTF16PtrFromString(args)
|
||||||
|
err := windows.ShellExecute(0, verbPtr, exePtr, argPtr, cwdPtr, 1)
|
||||||
|
if err != nil {
|
||||||
|
logging.LogErrorf("add Windows Defender exclusion path [%s] failed: %s", installPath, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO Conf.System.MicrosoftDefenderExcluded = true
|
||||||
|
Conf.Save()
|
||||||
|
}
|
||||||
|
|
||||||
|
func isUsingMicrosoftDefender() bool {
|
||||||
|
if !gulu.OS.IsWindows() {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
cmd := exec.Command("powershell", "-Command", "Get-MpPreference")
|
||||||
|
gulu.CmdAttr(cmd)
|
||||||
|
return cmd.Run() == nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func isAdmin() bool {
|
||||||
|
_, err := os.Open("\\\\.\\PHYSICALDRIVE0")
|
||||||
|
return err == nil
|
||||||
|
}
|
||||||
Loading…
Add table
Add a link
Reference in a new issue