Fix ssh error login (#292)

thomiceli · Jun 3, 2024 · 7d113e0 · 7d113e0
1 parent 38892d8
commit 7d113e0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -38,7 +38,7 @@ build_dev_docker:
  docker build -t $(BINARY_NAME)-dev:latest --target dev .
 
 run_dev_docker:
- docker run -v .:/opengist -p 6157:6157 -p 16157:16157 -v $(HOME)/.opengist-dev:/root/.opengist --rm $(BINARY_NAME)-dev:latest
+ docker run -v .:/opengist -p 6157:6157 -p 16157:16157 -p 2222:2222 -v $(HOME)/.opengist-dev:/root/.opengist --rm $(BINARY_NAME)-dev:latest
 
 watch_frontend:
  @echo "Building frontend assets..."

diff --git a/internal/ssh/run.go b/internal/ssh/run.go
@@ -25,8 +25,8 @@ func Start() {
  PublicKeyCallback: func(conn ssh.ConnMetadata, key ssh.PublicKey) (*ssh.Permissions, error) {
  strKey := strings.TrimSpace(string(ssh.MarshalAuthorizedKey(key)))
  exists, err := db.SSHKeyDoesExists(strKey)
- if !exists {
- if !errors.Is(err, gorm.ErrRecordNotFound) {
+ if !exists || err != nil {
+ if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
  return nil, err
  }