Skip to content

Commit e559f06

Browse files
jsiebensjsiebens
committed
rebrand to brink
1 parent 0fc1588 commit e559f06

23 files changed

+73
-73
lines changed

‎Dockerfile

+7-7
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@ RUN VERSION=$(git describe --all --exact-match `git rev-parse HEAD` | grep tags
1515
&& GIT_COMMIT=$(git rev-list -1 HEAD) \
1616
&& GOOS=${TARGETOS} GOARCH=${TARGETARCH} CGO_ENABLED=${CGO_ENABLED} go build \
1717
--ldflags "-s -w \
18-
-X github.com/jsiebens/proxiro/internal/version.GitCommit=${GIT_COMMIT}\
19-
-X github.com/jsiebens/proxiro/internal/version.Version=${VERSION}" \
20-
-a -installsuffix cgo -o proxiro cmd/proxiro/main.go
18+
-X github.com/jsiebens/brink/internal/version.GitCommit=${GIT_COMMIT}\
19+
-X github.com/jsiebens/brink/internal/version.Version=${VERSION}" \
20+
-a -installsuffix cgo -o brink cmd/brink/main.go
2121

2222
FROM --platform=${TARGETPLATFORM:-linux/amd64} alpine:3.14.2 as ship
2323

2424
RUN apk --no-cache add ca-certificates
25-
RUN addgroup -S proxiro && adduser -S -g proxiro proxiro
25+
RUN addgroup -S brink && adduser -S -g brink brink
2626

27-
COPY --from=build /src/proxiro /usr/local/bin
27+
COPY --from=build /src/brink /usr/local/bin
2828

29-
USER proxiro
30-
ENTRYPOINT ["proxiro"]
29+
USER brink
30+
ENTRYPOINT ["brink"]

‎Makefile

+8-8
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,22 @@ SHELL := bash
22
Version := $(shell git describe --tags --dirty)
33
# Version := "dev"
44
GitCommit := $(shell git rev-parse HEAD)
5-
LDFLAGS := "-s -w -X github.com/jsiebens/proxiro/internal/version.Version=$(Version) -X github.com/jsiebens/proxiro/internal/version.GitCommit=$(GitCommit)"
5+
LDFLAGS := "-s -w -X github.com/jsiebens/brink/internal/version.Version=$(Version) -X github.com/jsiebens/brink/internal/version.GitCommit=$(GitCommit)"
66
.PHONY: all
77

88
.PHONY: build
99
build:
10-
go build -ldflags $(LDFLAGS) -a -installsuffix cgo cmd/proxiro/main.go
10+
go build -ldflags $(LDFLAGS) -a -installsuffix cgo cmd/brink/main.go
1111

1212
.PHONY: dist
1313
dist:
1414
mkdir -p dist
15-
GOOS=linux go build -ldflags $(LDFLAGS) -a -installsuffix cgo -o dist/proxiro cmd/proxiro/main.go
16-
GOOS=darwin go build -ldflags $(LDFLAGS) -a -installsuffix cgo -o dist/proxiro-darwin cmd/proxiro/main.go
17-
GOOS=linux GOARCH=arm64 go build -ldflags $(LDFLAGS) -a -installsuffix cgo -o dist/proxiro-arm64 cmd/proxiro/main.go
18-
GOOS=linux GOARCH=arm GOARM=6 go build -ldflags $(LDFLAGS) -a -installsuffix cgo -o dist/proxiro-armhf cmd/proxiro/main.go
19-
GOOS=windows go build -ldflags $(LDFLAGS) -a -installsuffix cgo -o dist/proxiro.exe cmd/proxiro/main.go
15+
GOOS=linux go build -ldflags $(LDFLAGS) -a -installsuffix cgo -o dist/brink cmd/brink/main.go
16+
GOOS=darwin go build -ldflags $(LDFLAGS) -a -installsuffix cgo -o dist/brink-darwin cmd/brink/main.go
17+
GOOS=linux GOARCH=arm64 go build -ldflags $(LDFLAGS) -a -installsuffix cgo -o dist/brink-arm64 cmd/brink/main.go
18+
GOOS=linux GOARCH=arm GOARM=6 go build -ldflags $(LDFLAGS) -a -installsuffix cgo -o dist/brink-armhf cmd/brink/main.go
19+
GOOS=windows go build -ldflags $(LDFLAGS) -a -installsuffix cgo -o dist/brink.exe cmd/brink/main.go
2020

2121
.PHONY: hash
2222
hash:
23-
for f in dist/proxiro*; do shasum -a 256 $$f > $$f.sha256; done
23+
for f in dist/brink*; do shasum -a 256 $$f > $$f.sha256; done

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
# proxiro
1+
# brink
22

33
a lightweight identity-aware proxy

‎cmd/proxiro/main.go renamed to ‎cmd/brink/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package main
22

33
import (
4-
"github.com/jsiebens/proxiro/internal/cmd"
4+
"github.com/jsiebens/brink/internal/cmd"
55
"os"
66
)
77

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module github.com/jsiebens/proxiro
1+
module github.com/jsiebens/brink
22

33
go 1.17
44

‎internal/auth/providers/oidc.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package providers
33
import (
44
"context"
55
"fmt"
6-
"github.com/jsiebens/proxiro/internal/config"
6+
"github.com/jsiebens/brink/internal/config"
77
"strings"
88

99
"github.com/coreos/go-oidc/v3/oidc"

‎internal/auth/server.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ import (
55
"errors"
66
"fmt"
77
"github.com/hashicorp/go-bexpr"
8-
"github.com/jsiebens/proxiro/internal/api"
9-
"github.com/jsiebens/proxiro/internal/auth/providers"
10-
"github.com/jsiebens/proxiro/internal/cache"
11-
"github.com/jsiebens/proxiro/internal/config"
12-
"github.com/jsiebens/proxiro/internal/proxy"
13-
"github.com/jsiebens/proxiro/internal/util"
8+
"github.com/jsiebens/brink/internal/api"
9+
"github.com/jsiebens/brink/internal/auth/providers"
10+
"github.com/jsiebens/brink/internal/cache"
11+
"github.com/jsiebens/brink/internal/config"
12+
"github.com/jsiebens/brink/internal/proxy"
13+
"github.com/jsiebens/brink/internal/util"
1414
"github.com/labstack/echo/v4"
1515
"github.com/mitchellh/pointerstructure"
1616
"net/http"

‎internal/auth/templates/error.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
border: none;
5151
}
5252
</style>
53-
<title>proxiro</title>
53+
<title>brink</title>
5454
</head>
5555
<body>
5656
<div class="wrapper">

‎internal/auth/templates/success.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
border: none;
5151
}
5252
</style>
53-
<title>proxiro</title>
53+
<title>brink</title>
5454
</head>
5555
<body>
5656
<div class="wrapper">

‎internal/auth/templates/unauthorized.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
border: none;
5151
}
5252
</style>
53-
<title>proxiro</title>
53+
<title>brink</title>
5454
</head>
5555
<body>
5656
<div class="wrapper">

‎internal/cache/cache.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package cache
22

33
import (
44
"fmt"
5-
"github.com/jsiebens/proxiro/internal/config"
5+
"github.com/jsiebens/brink/internal/config"
66
"time"
77
)
88

‎internal/client/client.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import (
77
"fmt"
88
"github.com/go-resty/resty/v2"
99
"github.com/gorilla/websocket"
10-
"github.com/jsiebens/proxiro/internal/api"
11-
"github.com/jsiebens/proxiro/internal/proxy"
12-
"github.com/jsiebens/proxiro/internal/util"
10+
"github.com/jsiebens/brink/internal/api"
11+
"github.com/jsiebens/brink/internal/proxy"
12+
"github.com/jsiebens/brink/internal/util"
1313
"github.com/rancher/remotedialer"
1414
"github.com/sirupsen/logrus"
1515
"io/ioutil"

‎internal/client/token.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ import (
77
)
88

99
func LoadAuthToken(proxy string) (string, error) {
10-
token, err := keyring.Get(fmt.Sprintf("proxiro - %s", proxy), "default")
10+
token, err := keyring.Get(fmt.Sprintf("brink - %s", proxy), "default")
1111
if err != nil && !errors.Is(err, keyring.ErrNotFound) {
1212
return "", err
1313
}
1414
return token, nil
1515
}
1616

1717
func StoreAuthToken(proxy, token string) error {
18-
return keyring.Set(fmt.Sprintf("proxiro - %s", proxy), "default", token)
18+
return keyring.Set(fmt.Sprintf("brink - %s", proxy), "default", token)
1919
}
2020

2121
func DeleteAuthToken(proxy string) error {
22-
return keyring.Delete(fmt.Sprintf("proxiro - %s", proxy), "default")
22+
return keyring.Delete(fmt.Sprintf("brink - %s", proxy), "default")
2323
}

‎internal/cmd/authenticate.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package cmd
22

33
import (
44
"fmt"
5-
"github.com/jsiebens/proxiro/internal/client"
6-
"github.com/jsiebens/proxiro/internal/util"
5+
"github.com/jsiebens/brink/internal/client"
6+
"github.com/jsiebens/brink/internal/util"
77
"github.com/sirupsen/logrus"
88
"github.com/spf13/cobra"
99
"io/ioutil"
@@ -12,7 +12,7 @@ import (
1212
func authenticateCommand() *cobra.Command {
1313
command := &cobra.Command{
1414
Use: "authenticate",
15-
Short: "Authenticate the Proxiro Client for a specific Proxy.",
15+
Short: "Authenticate the Brink Client for a specific Proxy.",
1616
SilenceUsage: true,
1717
}
1818

@@ -21,7 +21,7 @@ func authenticateCommand() *cobra.Command {
2121
command.RunE = func(cmd *cobra.Command, args []string) error {
2222
logrus.SetOutput(ioutil.Discard)
2323

24-
proxyAddr := getString(ProxiroProxyAddr, proxyAddrFlag)
24+
proxyAddr := getString(BrinkProxyAddr, proxyAddrFlag)
2525
if proxyAddr == "" {
2626
return fmt.Errorf("required flag --proxy-addr is missing")
2727
}
@@ -42,7 +42,7 @@ func logoutCommand() *cobra.Command {
4242
registerProxyFlags(command)
4343

4444
command.RunE = func(cmd *cobra.Command, args []string) error {
45-
proxyAddr := getString(ProxiroProxyAddr, proxyAddrFlag)
45+
proxyAddr := getString(BrinkProxyAddr, proxyAddrFlag)
4646
if proxyAddr == "" {
4747
return fmt.Errorf("required flag --proxy-addr is missing")
4848
}

‎internal/cmd/client.go

+10-10
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package cmd
33
import (
44
"context"
55
"fmt"
6-
"github.com/jsiebens/proxiro/internal/client"
6+
"github.com/jsiebens/brink/internal/client"
77
"github.com/sirupsen/logrus"
88
"github.com/spf13/cobra"
99
"golang.org/x/sys/execabs"
@@ -20,7 +20,7 @@ var (
2020
)
2121

2222
func registerProxyFlags(command *cobra.Command) {
23-
command.Flags().StringVarP(&proxyAddrFlag, "proxy-addr", "r", "", fmt.Sprintf("Addr of the Proxiro proxy. This can also be specified via the environment variable %s.", ProxiroProxyAddr))
23+
command.Flags().StringVarP(&proxyAddrFlag, "proxy-addr", "r", "", fmt.Sprintf("Addr of the Brink proxy. This can also be specified via the environment variable %s.", BrinkProxyAddr))
2424
command.Flags().BoolVar(&tlsSkipVerify, "tls-skip-verify", false, "Disable verification of TLS certificates, highly discouraged as it decreases the security of data transmissions.")
2525
command.Flags().StringVar(&caFile, "ca-file", "", "Path on the local disk to a single PEM-encoded CA certificate to verify the proxy or server SSL certificate.")
2626
}
@@ -49,12 +49,12 @@ func connectCommand() *cobra.Command {
4949

5050
logrus.SetOutput(ioutil.Discard)
5151

52-
proxyAddr := getString(ProxiroProxyAddr, proxyAddrFlag)
52+
proxyAddr := getString(BrinkProxyAddr, proxyAddrFlag)
5353
if proxyAddr == "" {
5454
return fmt.Errorf("required flag --proxy-addr is missing")
5555
}
5656

57-
targetAddr := getString(ProxiroTargetAddr, targetAddrFlag)
57+
targetAddr := getString(BrinkTargetAddr, targetAddrFlag)
5858
if targetAddr == "" {
5959
return fmt.Errorf("required flag --target-addr is missing")
6060
}
@@ -108,12 +108,12 @@ func sshCommand() *cobra.Command {
108108

109109
logrus.SetOutput(ioutil.Discard)
110110

111-
proxyAddr := getString(ProxiroProxyAddr, proxyAddrFlag)
111+
proxyAddr := getString(BrinkProxyAddr, proxyAddrFlag)
112112
if proxyAddr == "" {
113113
return fmt.Errorf("required flag --proxy-addr is missing")
114114
}
115115

116-
targetAddr := getString(ProxiroTargetAddr, targetAddrFlag)
116+
targetAddr := getString(BrinkTargetAddr, targetAddrFlag)
117117
if targetAddr == "" {
118118
return fmt.Errorf("required flag --target-addr is missing")
119119
}
@@ -151,10 +151,10 @@ func execOnConnect(cmd string, buildArgs func(addr string, ip string, port strin
151151

152152
stringReplacer := func(in, typ, replacer string) string {
153153
for _, style := range []string{
154-
fmt.Sprintf("{{proxiro.%s}}", typ),
155-
fmt.Sprintf("{{ proxiro.%s}}", typ),
156-
fmt.Sprintf("{{proxiro.%s }}", typ),
157-
fmt.Sprintf("{{ proxiro.%s }}", typ),
154+
fmt.Sprintf("{{brink.%s}}", typ),
155+
fmt.Sprintf("{{ brink.%s}}", typ),
156+
fmt.Sprintf("{{brink.%s }}", typ),
157+
fmt.Sprintf("{{ brink.%s }}", typ),
158158
} {
159159
in = strings.Replace(in, style, replacer, -1)
160160
}

‎internal/cmd/cmd.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ import (
66
)
77

88
const (
9-
ProxiroProxyAddr = "PROXIRO_PROXY_ADDR"
10-
ProxiroTargetAddr = "PROXIRO_TARGET_ADDR"
9+
BrinkProxyAddr = "BRINK_PROXY_ADDR"
10+
BrinkTargetAddr = "BRINK_TARGET_ADDR"
1111
)
1212

1313
func Execute() error {
1414
rootCmd := &cobra.Command{
15-
Use: "proxiro",
15+
Use: "brink",
1616
}
1717

1818
rootCmd.AddCommand(serverCommand())

‎internal/cmd/proxy.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package cmd
22

33
import (
4-
"github.com/jsiebens/proxiro/internal/config"
5-
"github.com/jsiebens/proxiro/internal/server"
4+
"github.com/jsiebens/brink/internal/config"
5+
"github.com/jsiebens/brink/internal/server"
66
"github.com/spf13/cobra"
77
)
88

‎internal/cmd/server.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package cmd
22

33
import (
4-
"github.com/jsiebens/proxiro/internal/config"
5-
"github.com/jsiebens/proxiro/internal/server"
4+
"github.com/jsiebens/brink/internal/config"
5+
"github.com/jsiebens/brink/internal/server"
66
"github.com/spf13/cobra"
77
)
88

‎internal/cmd/version.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package cmd
22

33
import (
44
"fmt"
5-
"github.com/jsiebens/proxiro/internal/version"
5+
"github.com/jsiebens/brink/internal/version"
66
"github.com/spf13/cobra"
77
)
88

‎internal/config/config.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ func LoadConfig(path string) (*Config, error) {
1313
}
1414

1515
v := enviper.New(viper.New())
16-
v.SetEnvPrefix("proxiro")
16+
v.SetEnvPrefix("brink")
1717
v.AutomaticEnv()
1818

1919
if len(path) != 0 {

‎internal/proxy/server.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ import (
55
"encoding/hex"
66
"fmt"
77
"github.com/go-resty/resty/v2"
8-
"github.com/jsiebens/proxiro/internal/api"
9-
"github.com/jsiebens/proxiro/internal/cache"
10-
"github.com/jsiebens/proxiro/internal/config"
11-
"github.com/jsiebens/proxiro/internal/util"
8+
"github.com/jsiebens/brink/internal/api"
9+
"github.com/jsiebens/brink/internal/cache"
10+
"github.com/jsiebens/brink/internal/config"
11+
"github.com/jsiebens/brink/internal/util"
1212
"github.com/labstack/echo/v4"
1313
"github.com/rancher/remotedialer"
1414
"github.com/sirupsen/logrus"
@@ -20,8 +20,8 @@ import (
2020
)
2121

2222
const (
23-
IdHeader = "x-proxiro-id"
24-
AuthHeader = "x-proxiro-auth"
23+
IdHeader = "x-brink-id"
24+
AuthHeader = "x-brink-auth"
2525
)
2626

2727
func NewServer(config *config.Config, cache cache.Cache, registrar SessionRegistrar) (*Server, error) {

‎internal/proxy/session.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"context"
55
"fmt"
66
"github.com/go-resty/resty/v2"
7-
"github.com/jsiebens/proxiro/internal/api"
8-
"github.com/jsiebens/proxiro/internal/util"
7+
"github.com/jsiebens/brink/internal/api"
8+
"github.com/jsiebens/brink/internal/util"
99
"github.com/labstack/echo/v4"
1010
"net/http"
1111
)

‎internal/server/server.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package server
22

33
import (
4-
"github.com/jsiebens/proxiro/internal/auth"
5-
"github.com/jsiebens/proxiro/internal/auth/templates"
6-
"github.com/jsiebens/proxiro/internal/cache"
7-
"github.com/jsiebens/proxiro/internal/config"
8-
"github.com/jsiebens/proxiro/internal/proxy"
9-
"github.com/jsiebens/proxiro/internal/version"
4+
"github.com/jsiebens/brink/internal/auth"
5+
"github.com/jsiebens/brink/internal/auth/templates"
6+
"github.com/jsiebens/brink/internal/cache"
7+
"github.com/jsiebens/brink/internal/config"
8+
"github.com/jsiebens/brink/internal/proxy"
9+
"github.com/jsiebens/brink/internal/version"
1010
"github.com/labstack/echo/v4"
1111
"github.com/sirupsen/logrus"
1212
)

0 commit comments

Comments
 (0)