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.

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

Jump to bottom

[pull] master from thomiceli:master #6

Merged
merged 7 commits into from
Jun 4, 2024
Merged

[pull] master from thomiceli:master #6

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7d113e0
Fix ssh error login (#292)
thomiceli Jun 3, 2024
d40eb65
Fix translation string (#293)
thomiceli Jun 3, 2024
f490f36
Update deps
thomiceli Jun 3, 2024
e969f04
Translations update from Weblate (#281)
thomiceli Jun 3, 2024
9043cbc
Update deps
thomiceli Jun 3, 2024
22dbc32
v1.7.3
thomiceli Jun 3, 2024
a97f54d
Finish german translation (#294)
TheZoker Jun 3, 2024
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
Next Next commit
Fix ssh error login (thomiceli#292)
  • Loading branch information
@thomiceli
thomiceli committed Jun 3, 2024
commit 7d113e026e9485dd18e075551e84abb671e474ae
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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..."
Expand Down
4 changes: 2 additions & 2 deletions internal/ssh/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down