8000 add an option in gui to select a config file by elecm · Pull Request #33 · bepass-org/bepass · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

add an option in gui to select a config file #33

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Aug 17, 2023
Merged

add an option in gui to select a config file #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
/build
build/
.idea
154 changes: 115 additions & 39 deletions bepass/cmd/gui/gui.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,35 @@ package main

import (
"bepass/cmd/core"
"encoding/json"
"fmt"
"io"

"fyne.io/fyne/v2"
"fyne.io/fyne/v2/app"
"fyne.io/fyne/v2/container"
"fyne.io/fyne/v2/dialog"
"fyne.io/fyne/v2/layout"
"fyne.io/fyne/v2/storage"
"fyne.io/fyne/v2/widget"
)

func main() {
myApp := app.New()
myWindow := myApp.NewWindow("Bepass GUI")
myWindow.Resize(fyne.NewSize(300, 300))
myWindow.Resize(fyne.NewSize(500, 500))

ui := createUIComponents()
ui := createUIComponents(&myWindow)

content := container.NewVBox(
widget.NewLabel("DOH Address:"),
ui.profile,
ui.dohLabel,
ui.dohInput,
widget.NewLabel("Socks Address to listen on:"),
ui.listenLabel,
ui.listenInput,
ui.openFileLabel,
ui.openFileButton,
layout.NewSpacer(),
ui.connectButton,
)

Expand All @@ -28,65 +39,130 @@ func main() {
}

type UIComponents struct {
dohInput *widget.Entry
listenInput *widget.Entry
connectButton *widget.Button
isConnected bool
coreConfig *core.Config
profile *widget.RadioGroup
dohLabel *widget.Label
dohInput *widget.Entry
listenLabel *widget.Label
listenInput *widget.Entry
openFileLabel *widget.Label
openFileButton *widget.Button
connectButton *widget.Button
isConnected bool
coreConfig *core.Config
}

func createUIComponents() *UIComponents {
func createUIComponents(myWindow *fyne.Window) *UIComponents {
ui := &UIComponents{}
ui.dohInput = widget.NewEntry()
ui.dohInput.SetText("https://yarp.lefolgoc.net/dns-query")
ui.listenInput = widget.NewEntry()
ui.listenInput.SetText("0.0.0.0:8085")
ui.connectButton = widget.NewButton("Connect", func() {
ui.ToggleConnection()
ui.ToggleConnection(myWindow)
})
ui.connectButton.Enable()

ui.dohLabel = widget.NewLabel("DOH Address:")
ui.listenLabel = widget.NewLabel("Socks Address to listen on:")
ui.openFileLabel = widget.NewLabel("Config:")

ui.openFileButton = widget.NewButton("Select", func() {
fd := dialog.NewFileOpen(func(reader fyne.URIReadCloser, err error) {
if err != nil {
dialog.ShowError(err, *myWindow)
return
}
if reader == nil {
return
}
data, err := io.ReadAll(reader)
if err != nil {
dialog.ShowError(err, *myWindow)
return
}
err = json.Unmarshal(data, &ui.coreConfig)
if err != nil {
dialog.ShowError(err, *myWindow)
return
}
ui.openFileLabel.SetText(fmt.Sprintf("config: %s", reader.URI().String()))
}, *myWindow)
cwd, _ := storage.ListerForURI(storage.NewFileURI("."))
fd.SetLocation(cwd)
fd.SetFilter(storage.NewExtensionFileFilter([]string{".json"}))
fd.Show()
})

ui.profile = widget.NewRadioGroup([]string{"Default", "Config"}, func(value string) {
if value == "Default" {
ui.openFileLabel.Hide()
ui.openFileButton.Hide()
ui.dohLabel.Show()
ui.dohInput.Show()
ui.listenLabel.Show()
ui.listenInput.Show()
} else {
ui.dohLabel.Hide()
ui.dohInput.Hide()
ui.listenLabel.Hide()
ui.listenInput.Hide()
ui.openFileLabel.Show()
ui.openFileButton.Show()
ui.coreConfig = nil
}
})
ui.profile.SetSelected("Default")

ui.isConnected = false

return ui
}

func (ui *UIComponents) ToggleConnection() {
func (ui *UIComponents) ToggleConnection(myWindow *fyne.Window) {
if ui.isConnected {
ui.Disconnect()
ui.Disconnect(myWindow)
} else {
ui.Connect()
ui.Connect(myWindow)
}
}

func (ui *UIComponents) Connect() {
firstValue := ui.dohInput.Text
secondValue := ui.listenInput.Text

config := &core.Config{
TLSHeaderLength: 5,
DnsCacheTTL: 3600,
WorkerAddress: "worker.example.com",
WorkerIPPortAddress: "192.168.0.1:8080",
WorkerEnabled: true,
WorkerDNSOnly: false,
RemoteDNSAddr: firstValue,
BindAddress: secondValue,
ChunksLengthBeforeSni: [2]int{10, 20},
SniChunksLength: [2]int{30, 40},
ChunksLengthAfterSni: [2]int{50, 60},
DelayBetweenChunks: [2]int{70, 80},
ResolveSystem: "doh",
DoHClient: nil, // Initialize appropriately
func (ui *UIComponents) Connect(myWindow *fyne.Window) {

if ui.profile.Selected == "Default" {
firstValue := ui.dohInput.Text
secondValue := ui.listenInput.Text

ui.coreConfig = &core.Config{
TLSHeaderLength: 5,
DnsCacheTTL: 3600,
WorkerAddress: "worker.example.com",
WorkerIPPortAddress: "192.168.0.1:8080",
WorkerEnabled: true,
WorkerDNSOnly: false,
RemoteDNSAddr: firstValue,
BindAddress: secondValue,
ChunksLengthBeforeSni: [2]int{10, 20},
SniChunksLength: [2]int{30, 40},
ChunksLengthAfterSni: [2]int{50, 60},
DelayBetweenChunks: [2]int{70, 80},
ResolveSystem: "doh",
DoHClient: nil, // Initialize appropriately
}
}

ui.coreConfig = config
if ui.coreConfig == nil {
dialog.ShowError(fmt.Errorf("config isn't selected"), *myWindow)
return
}

go func() {
err := core.RunServer(config, true)
err := core.RunServer(ui.coreConfig, true)
if err != nil {
//errorMessage := "Error: " + err.Error()
// Later we can handle the error using a dialog
dialog.ShowError(err, *myWindow)
ui.isConnected = false
ui.dohInput.Enable()
ui.listenInput.Enable()
ui.connectButton.SetText("Connect")
}
}()

Expand All @@ -96,13 +172,13 @@ func (ui *UIComponents) Connect() {
ui.connectButton.SetText("Disconnect")
}

func (ui *UIComponents) Disconnect() {
func (ui *UIComponents) Disconnect(myWindow *fyne.Window) {
go func() {
if ui.coreConfig != nil {
err := core.ShutDown()

if err != nil {
// Later we can handle the error using a dialog
dialog.ShowError(err, *myWindow)
}
}
}()
Expand Down
0