Skip to content

dev: bind servers to loopback by default #4211

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

Open
benma wants to merge 1 commit into
base: master
Choose a base branch
from
Open

dev: bind servers to loopback by default #4211

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
15 changes: 12 additions & 3 deletions cmd/servewallet/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,21 @@ import (
)

const (
port = 8082
address = "0.0.0.0"
darwin = "darwin"
port = 8082
defaultBindAddress = "127.0.0.1"
bindAddressEnvVar = "BITBOX_DEV_BIND_HOST"
darwin = "darwin"
)

var backend *backendPkg.Backend

func bindAddress() string {
if address := os.Getenv(bindAddressEnvVar); address != "" {
return address
}
return defaultBindAddress
}

// webdevEnvironment implements backend.Environment.
type webdevEnvironment struct {
}
Expand Down Expand Up @@ -189,6 +197,7 @@ func (webdevEnvironment) DetectDarkTheme() bool {

func main() {
config.SetAppDir("appfolder.dev")
address := bindAddress()

mainnet := flag.Bool("mainnet", false, "switch to mainnet instead of testnet coins")
regtest := flag.Bool("regtest", false, "use regtest instead of testnet coins")
Expand Down
2 changes: 1 addition & 1 deletion frontends/web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
},
"scripts": {
"dev": "npm run start",
"start": "vite --cors --host",
"start": "vite --cors",
"build": "npm run typescript && vite build",
"lint": "npm run typescript && eslint ./src ./tests",
"postlint": "node ./scripts/sort-json.mjs ./src/locales --check",
Expand Down
2 changes: 2 additions & 0 deletions frontends/web/vite.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { configDefaults } from 'vitest/config';

export default defineConfig((env) => {
const envVars = loadEnv(env.mode, process.cwd(), '')
const host = envVars.BITBOX_DEV_BIND_HOST || '127.0.0.1'
const port = envVars.VITE_PORT
return {
// Relative base path so the js/css files are referenced with `./index-...js` instead of
Expand Down Expand Up @@ -37,6 +38,7 @@ export default defineConfig((env) => {
],
},
server: {
host,
port: typeof port !== 'undefined' ? port : 8080,
strictPort: true,
}
Expand Down
3 changes: 2 additions & 1 deletion scripts/dockerdev.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ dockerdev () {
--platform "linux/amd64" \
--privileged -v /dev/bus/usb:/dev/bus/usb \
--interactive --tty \
--name=$container_name -p 8080:8080 -p 8082:8082 \
--env BITBOX_DEV_BIND_HOST=0.0.0.0 \
--name=$container_name -p 127.0.0.1:8080:8080 -p 127.0.0.1:8082:8082 \
--add-host="dev.shiftcrypto.ch:176.9.28.202" \
--add-host="dev1.shiftcrypto.ch:176.9.28.155" \
--add-host="dev2.shiftcrypto.ch:176.9.28.156" \
Expand Down