Skip to content
This repository was archived by the owner on Jan 22, 2025. It is now read-only.
Merged
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
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/keybase/bot-ssh-ca
module github.com/keybase/bot-sshca

go 1.12

Expand Down
14 changes: 7 additions & 7 deletions src/cmd/keybaseca/keybaseca.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@ import (
"sync"
"syscall"

"github.com/keybase/bot-ssh-ca/src/keybaseca/constants"
"github.com/keybase/bot-sshca/src/keybaseca/constants"

"github.com/google/uuid"

"github.com/keybase/bot-ssh-ca/src/keybaseca/bot"
"github.com/keybase/bot-ssh-ca/src/keybaseca/config"
klog "github.com/keybase/bot-ssh-ca/src/keybaseca/log"
"github.com/keybase/bot-ssh-ca/src/keybaseca/sshutils"
"github.com/keybase/bot-ssh-ca/src/kssh"
"github.com/keybase/bot-ssh-ca/src/shared"
"github.com/keybase/bot-sshca/src/keybaseca/bot"
"github.com/keybase/bot-sshca/src/keybaseca/config"
klog "github.com/keybase/bot-sshca/src/keybaseca/log"
"github.com/keybase/bot-sshca/src/keybaseca/sshutils"
"github.com/keybase/bot-sshca/src/kssh"
"github.com/keybase/bot-sshca/src/shared"

"github.com/urfave/cli"
)
Expand Down
6 changes: 3 additions & 3 deletions src/cmd/kssh/kssh.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import (
"strings"
"time"

"github.com/keybase/bot-ssh-ca/src/keybaseca/sshutils"
"github.com/keybase/bot-sshca/src/keybaseca/sshutils"

"github.com/google/uuid"
"github.com/keybase/bot-ssh-ca/src/kssh"
"github.com/keybase/bot-ssh-ca/src/shared"
"github.com/keybase/bot-sshca/src/kssh"
"github.com/keybase/bot-sshca/src/shared"
log "github.com/sirupsen/logrus"

"golang.org/x/crypto/ssh"
Expand Down
4 changes: 2 additions & 2 deletions src/cmd/kssh/kssh_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"os"
"testing"

"github.com/keybase/bot-ssh-ca/src/shared"
"github.com/keybase/bot-sshca/src/shared"
"github.com/stretchr/testify/require"
)

Expand All @@ -26,7 +26,7 @@ func copyKeyFromTestFixture(t *testing.T, name, destination string) {
}

func TestIsValidCert(t *testing.T) {
certTestFilename := "/tmp/bot-ssh-ca-test-is-valid-cert"
certTestFilename := "/tmp/bot-sshca-test-is-valid-cert"

os.Remove(certTestFilename)
os.Remove(shared.KeyPathToPubKey(certTestFilename))
Expand Down
10 changes: 5 additions & 5 deletions src/keybaseca/bot/bot.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ import (
"fmt"
"strings"

"github.com/keybase/bot-ssh-ca/src/keybaseca/botwrapper"
"github.com/keybase/bot-sshca/src/keybaseca/botwrapper"

"github.com/keybase/bot-ssh-ca/src/keybaseca/log"
"github.com/keybase/bot-sshca/src/keybaseca/log"

"github.com/keybase/bot-ssh-ca/src/keybaseca/sshutils"
"github.com/keybase/bot-sshca/src/keybaseca/sshutils"

"github.com/keybase/bot-ssh-ca/src/keybaseca/config"
"github.com/keybase/bot-ssh-ca/src/shared"
"github.com/keybase/bot-sshca/src/keybaseca/config"
"github.com/keybase/bot-sshca/src/shared"
"github.com/keybase/go-keybase-chat-bot/kbchat"
)

Expand Down
6 changes: 3 additions & 3 deletions src/keybaseca/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ import (
"os"
"strings"

"github.com/keybase/bot-ssh-ca/src/keybaseca/constants"
"github.com/keybase/bot-sshca/src/keybaseca/constants"

"github.com/keybase/bot-ssh-ca/src/keybaseca/botwrapper"
"github.com/keybase/bot-sshca/src/keybaseca/botwrapper"

"github.com/keybase/bot-ssh-ca/src/shared"
"github.com/keybase/bot-sshca/src/shared"
)

// Represents a loaded and validated config for keybaseca
Expand Down
2 changes: 1 addition & 1 deletion src/keybaseca/constants/kbfs.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package constants

import "github.com/keybase/bot-ssh-ca/src/shared"
import "github.com/keybase/bot-sshca/src/shared"

// Get the default KBFSOperation struct used for KBFS operations. Currently keybaseca does not support running with a
// custom keybase binary path
Expand Down
4 changes: 2 additions & 2 deletions src/keybaseca/log/log.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"strings"
"time"

"github.com/keybase/bot-ssh-ca/src/keybaseca/constants"
"github.com/keybase/bot-sshca/src/keybaseca/constants"

"github.com/keybase/bot-ssh-ca/src/keybaseca/config"
"github.com/keybase/bot-sshca/src/keybaseca/config"
)

// Log attempts to log the given string to a file. If conf.GetStrictLogging() it will panic if it fails
Expand Down
4 changes: 2 additions & 2 deletions src/keybaseca/sshutils/generate_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ import (
"strings"
"testing"

"github.com/keybase/bot-ssh-ca/src/shared"
"github.com/keybase/bot-sshca/src/shared"
"github.com/stretchr/testify/require"
)

// Test generating a new SSH key
func TestGenerateNewSSHKey(t *testing.T) {
filename := "/tmp/bot-ssh-ca-integration-test-generate-key"
filename := "/tmp/bot-sshca-integration-test-generate-key"
os.Remove(filename)

err := GenerateNewSSHKey(filename, false, false)
Expand Down
2 changes: 1 addition & 1 deletion src/keybaseca/sshutils/generate_windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"io/ioutil"
"os"

"github.com/keybase/bot-ssh-ca/src/shared"
"github.com/keybase/bot-sshca/src/shared"
"golang.org/x/crypto/ssh"
)

Expand Down
8 changes: 4 additions & 4 deletions src/keybaseca/sshutils/sshutils.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ import (
"os/exec"
"strings"

"github.com/keybase/bot-ssh-ca/src/keybaseca/botwrapper"
"github.com/keybase/bot-sshca/src/keybaseca/botwrapper"

"github.com/keybase/bot-ssh-ca/src/keybaseca/log"
"github.com/keybase/bot-sshca/src/keybaseca/log"

"github.com/keybase/bot-ssh-ca/src/keybaseca/config"
"github.com/keybase/bot-ssh-ca/src/shared"
"github.com/keybase/bot-sshca/src/keybaseca/config"
"github.com/keybase/bot-sshca/src/shared"

"github.com/google/uuid"
)
Expand Down
2 changes: 1 addition & 1 deletion src/kssh/bot.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"strings"
"time"

"github.com/keybase/bot-ssh-ca/src/shared"
"github.com/keybase/bot-sshca/src/shared"
"github.com/keybase/go-keybase-chat-bot/kbchat"
)

Expand Down
2 changes: 1 addition & 1 deletion src/kssh/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"strings"
"sync"

"github.com/keybase/bot-ssh-ca/src/shared"
"github.com/keybase/bot-sshca/src/shared"
)

// A ConfigFile that is provided by the keybaseca server process and lives in kbfs. It is used to share configuration
Expand Down
2 changes: 1 addition & 1 deletion src/kssh/ssh.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"os/exec"
"strings"

"github.com/keybase/bot-ssh-ca/src/shared"
"github.com/keybase/bot-sshca/src/shared"
)

// Add the SSH key at the given location to the currently running SSH agent. Errors if there is no running ssh-agent.
Expand Down
2 changes: 1 addition & 1 deletion src/shared/kbfs.go
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ func (ko *KBFSOperation) KBFSWrite(filename string, contents string, appendToFil
cmd = exec.Command(ko.KeybaseBinaryPath, "fs", "write", filename)
}

cmd.Stdin = strings.NewReader(string(contents))
cmd.Stdin = strings.NewReader(contents)
bytes, err := cmd.CombinedOutput()
if err != nil {
return fmt.Errorf("failed to write to file at %s: %s (%v)", filename, strings.TrimSpace(string(bytes)), err)
Expand Down