Compare commits

..

1 Commits

Author SHA1 Message Date
guardrails[bot]
26a7186f40 docs(readme): add GuardRails badge 2018-10-19 09:53:10 +00:00
6 changed files with 4 additions and 34 deletions

View File

@@ -414,4 +414,4 @@ This is totally experimental for now, so please file issues to let me know what
## License
[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fmoul%2Fsshportal.svg?type=large)](https://app.fossa.io/projects/git%2Bgithub.com%2Fmoul%2Fsshportal?ref=badge_large)
[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fmoul%2Fsshportal.svg?type=large)](https://app.fossa.io/projects/git%2Bgithub.com%2Fmoul%2Fsshportal?ref=badge_large) [![GuardRails badge](https://badges.production.guardrails.io/moul/sshportal.svg)](https://www.guardrails.io)

View File

@@ -3,7 +3,6 @@ package main
import (
"fmt"
"os"
"time"
"github.com/urfave/cli"
)
@@ -14,7 +13,6 @@ type configServe struct {
logsLocation string
bindAddr string
debug, demo bool
idleTimeout time.Duration
}
func parseServeConfig(c *cli.Context) (*configServe, error) {
@@ -26,7 +24,6 @@ func parseServeConfig(c *cli.Context) (*configServe, error) {
debug: c.Bool("debug"),
demo: c.Bool("demo"),
logsLocation: c.String("logs-location"),
idleTimeout: c.Duration("idle-timeout"),
}
switch len(ret.aesKey) {
case 0, 16, 24, 32:

View File

@@ -1,4 +1,3 @@
// +build !windows
package main
import (

View File

@@ -1,12 +0,0 @@
// +build windows
package main
import (
"fmt"
"github.com/urfave/cli"
)
// testServer is an hidden handler used for integration tests
func testServer(c *cli.Context) error { return fmt.Errorf("not supported on this architecture") }

14
main.go
View File

@@ -3,7 +3,6 @@ package main
import (
"fmt"
"log"
"math"
"math/rand"
"net"
"os"
@@ -80,11 +79,6 @@ func main() {
Value: "./log",
Usage: "Store user session files",
},
cli.DurationFlag{
Name: "idle-timeout",
Value: 0,
Usage: "Duration before an inactive connection is timed out (0 to disable)",
},
},
}, {
Name: "healthcheck",
@@ -150,12 +144,6 @@ func server(c *configServe) (err error) {
Version: fmt.Sprintf("sshportal-%s", Version),
ChannelHandler: channelHandler,
}
if c.idleTimeout != 0 {
srv.IdleTimeout = c.idleTimeout
// gliderlabs/ssh requires MaxTimeout to be non-zero if we want to use IdleTimeout.
// So, set it to the max value, because we don't want a max timeout.
srv.MaxTimeout = math.MaxInt64
}
for _, opt := range []ssh.Option{
// custom PublicKeyAuth handler
@@ -169,6 +157,6 @@ func server(c *configServe) (err error) {
}
}
log.Printf("info: SSH Server accepting connections on %s, idle-timout=%v", c.bindAddr, c.idleTimeout)
log.Printf("info: SSH Server accepting connections on %s", c.bindAddr)
return srv.Serve(ln)
}

View File

@@ -5,8 +5,6 @@ import (
"io"
"log"
"os"
"path/filepath"
"strconv"
"strings"
"time"
@@ -126,8 +124,8 @@ func pipe(lreqs, rreqs <-chan *gossh.Request, lch, rch gossh.Channel, logsLocati
errch := make(chan error, 1)
channeltype := newChan.ChannelType()
fileNameUnix := strings.Join([]string{logsLocation, "/", user, "-", channeltype, "-", strconv.FormatInt(time.Now().UnixNano(), 10)}, "") // get user
file_name := filepath.FromSlash(fileNameUnix)
file_name := strings.Join([]string{logsLocation, "/", user, "-", channeltype, "-", time.Now().Format(time.RFC3339)}, "") // get user
f, err := os.OpenFile(file_name, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0640)
defer f.Close()