Skip to content
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.

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

Explaining the name #87

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 9 additions & 9 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ jobs:
matrix:
go-version: [ '1.20.x', '1.21.x' ]
goos: [linux]
testuser: [ssh3-testuser]
testpasswd: [ssh3-testpasswd]
testuserhome: [/home/ssh3-testuser]
testuser: [h3sh-testuser]
testpasswd: [h3sh-testpasswd]
testuserhome: [/home/h3sh-testuser]
archparams: [{goarch: amd64, cc: gcc}] #,{goarch: arm64, cc: aarch64-linux-gnu-gcc}]
runs-on: ubuntu-22.04

Expand All @@ -37,14 +37,14 @@ jobs:
run: sudo useradd -s /bin/bash -m ${{matrix.testuser}} && echo "${{matrix.testuser}}:${{matrix.testpasswd}}" | sudo chpasswd
- name: Ensure there are no existing .profile or similar files for testuser
run: sudo rm -f ${{matrix.testuserhome}}/.profile ${{matrix.testuserhome}}/.bash_profile ${{matrix.testuserhome}}/.bash_login
- name: Create .ssh3 directory
run: sudo su ${{matrix.testuser}} -c 'mkdir ${{matrix.testuserhome}}/.ssh ${{matrix.testuserhome}}/.ssh3'
- name: Create .h3sh directory
run: sudo su ${{matrix.testuser}} -c 'mkdir ${{matrix.testuserhome}}/.ssh ${{matrix.testuserhome}}/.h3sh'
- name: add the attacker's key as commented in testuser's authorzed identities
run: echo "#" $(cat attacker_id_rsa.pub) | sudo tee -a ${{matrix.testuserhome}}/.ssh3/authorized_identities
run: echo "#" $(cat attacker_id_rsa.pub) | sudo tee -a ${{matrix.testuserhome}}/.h3sh/authorized_identities
- name: Put test public keys in testuser's authorized_identities
run: cat /testuser_id_rsa.pub /testuser_id_ed25519.pub | sudo tee -a ${{matrix.testuserhome}}/.ssh3/authorized_identities
run: cat /testuser_id_rsa.pub /testuser_id_ed25519.pub | sudo tee -a ${{matrix.testuserhome}}/.h3sh/authorized_identities
- name: log authorized_identities
run: cat ${{matrix.testuserhome}}/.ssh3/authorized_identities
run: cat ${{matrix.testuserhome}}/.h3sh/authorized_identities
- name: Integration tests
run: sudo -E make -e integration-tests
env:
Expand All @@ -58,7 +58,7 @@ jobs:
CGO_ENABLED: "1"
GOOS: ${{matrix.goos}}
GOARCH: ${{matrix.archparams.goarch}}
SSH3_INTEGRATION_TESTS_WITH_SERVER_ENABLED: "1"
H3SH_INTEGRATION_TESTS_WITH_SERVER_ENABLED: "1"
build-macos:
strategy:
matrix:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ jobs:
matrix:
go-version: [ '1.20.x', '1.21.x' ]
goos: [linux]
testuser: [ssh3-testuser]
testpasswd: [ssh3-testpasswd]
testuserhome: [/home/ssh3-testuser]
testuser: [h3sh-testuser]
testpasswd: [h3sh-testpasswd]
testuserhome: [/home/h3sh-testuser]
archparams: [{goarch: amd64, cc: gcc}] #,{goarch: arm64, cc: aarch64-linux-gnu-gcc}]
runs-on: ubuntu-22.04

Expand Down
6 changes: 3 additions & 3 deletions .goreleaser-client-only-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ before:

builds:
-
id: "ssh3"
main: ./cmd/ssh3/main.go
binary: ssh3
id: "h3sh"
main: ./cmd/h3sh/main.go
binary: h3sh
goos:
- windows
goarch:
Expand Down
12 changes: 6 additions & 6 deletions .goreleaser-linux-amd64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ before:

builds:
-
id: "ssh3"
main: ./cmd/ssh3/main.go
binary: ssh3
id: "h3sh"
main: ./cmd/h3sh/main.go
binary: h3sh
goos:
- linux
goarch:
Expand All @@ -30,9 +30,9 @@ builds:
- static_build
- feature
-
id: "ssh3-server"
main: ./cmd/ssh3-server/main.go
binary: ssh3-server
id: "h3sh-server"
main: ./cmd/h3sh-server/main.go
binary: h3sh-server
env:
- CGO_ENABLED=1
- CC=/usr/local/musl/bin/musl-gcc
Expand Down
12 changes: 6 additions & 6 deletions .goreleaser-linux-arm64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ before:

builds:
-
id: "ssh3"
main: ./cmd/ssh3/main.go
binary: ssh3
id: "h3sh"
main: ./cmd/h3sh/main.go
binary: h3sh
goos:
- linux
goarch:
Expand All @@ -30,9 +30,9 @@ builds:
- static_build
- feature
-
id: "ssh3-server"
main: ./cmd/ssh3-server/main.go
binary: ssh3-server
id: "h3sh-server"
main: ./cmd/h3sh-server/main.go
binary: h3sh-server
env:
- CC=/tmp/aarch64-linux-musl-cross/bin/aarch64-linux-musl-gcc
- CGO_ENABLED=1
Expand Down
12 changes: 6 additions & 6 deletions .goreleaser-unix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ before:

builds:
-
id: "ssh3"
main: ./cmd/ssh3/main.go
binary: ssh3
id: "h3sh"
main: ./cmd/h3sh/main.go
binary: h3sh
goos:
- darwin
- freebsd
Expand All @@ -39,9 +39,9 @@ builds:
- netgo
- static_build
-
id: "ssh3-server"
main: ./cmd/ssh3-server/main.go
binary: ssh3-server
id: "h3sh-server"
main: ./cmd/h3sh-server/main.go
binary: h3sh-server
goos:
- darwin
- freebsd
Expand Down
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,17 @@ integration-tests:
CC=$(CC) \
CGO_ENABLED=1 \
GOOS=$(GOOS) \
SSH3_INTEGRATION_TESTS_WITH_SERVER_ENABLED=1 \
H3SH_INTEGRATION_TESTS_WITH_SERVER_ENABLED=1 \
go run github.com/onsi/ginkgo/v2/ginkgo ./integration_tests

install:
$(GO_OPTS) go install $(BUILDFLAGS) ./cmd/ssh3
$(GO_OPTS) go install $(BUILDFLAGS) ./cmd/ssh3-server
$(GO_OPTS) go install $(BUILDFLAGS) ./cmd/h3sh
$(GO_OPTS) go install $(BUILDFLAGS) ./cmd/h3sh-server

build: client server

client:
$(GO_OPTS) go build -tags "$(GO_TAGS)" $(BUILD_FLAGS) -o bin/client ./cmd/ssh3/
$(GO_OPTS) go build -tags "$(GO_TAGS)" $(BUILD_FLAGS) -o bin/client ./cmd/h3sh/

server:
$(GO_OPTS) go build -tags "$(GO_TAGS)" $(BUILD_FLAGS) -o bin/server ./cmd/ssh3-server/
$(GO_OPTS) go build -tags "$(GO_TAGS)" $(BUILD_FLAGS) -o bin/server ./cmd/h3sh-server/
Loading