mirror of
https://github.com/Luzifer/cloudkeys-go.git
synced 2024-11-09 22:50:05 +00:00
Knut Ahlers
a1df72edc5
commitf0db1ff1f8
Author: Knut Ahlers <knut@ahlers.me> Date: Sun Dec 24 12:19:56 2017 +0100 Mark option as deprecated Signed-off-by: Knut Ahlers <knut@ahlers.me> commit9891df2a16
Author: Knut Ahlers <knut@ahlers.me> Date: Sun Dec 24 12:11:56 2017 +0100 Fix: Typo Signed-off-by: Knut Ahlers <knut@ahlers.me> commit836006de64
Author: Knut Ahlers <knut@ahlers.me> Date: Sun Dec 24 12:04:20 2017 +0100 Add new dependencies Signed-off-by: Knut Ahlers <knut@ahlers.me> commitd64fee60c8
Author: Knut Ahlers <knut@ahlers.me> Date: Sun Dec 24 11:55:52 2017 +0100 Replace insecure password hashing Prior this commit passwords were hashed with a static salt and using the SHA1 hashing function. This could lead to passwords being attackable in case someone gets access to the raw data stored inside the database. This commit introduces password hashing using bcrypt hashing function which addresses this issue. Old passwords are not automatically re-hashed as they are unknown. Replacing the old password scheme is not that easy and needs #10 to be solved. Therefore the old hashing scheme is kept for compatibility reason. Signed-off-by: Knut Ahlers <knut@ahlers.me> Signed-off-by: Knut Ahlers <knut@ahlers.me> closes #14 closes #15
115 lines
2.8 KiB
Go
115 lines
2.8 KiB
Go
package ssh
|
|
|
|
import (
|
|
"errors"
|
|
"io"
|
|
"net"
|
|
)
|
|
|
|
// streamLocalChannelOpenDirectMsg is a struct used for SSH_MSG_CHANNEL_OPEN message
|
|
// with "direct-streamlocal@openssh.com" string.
|
|
//
|
|
// See openssh-portable/PROTOCOL, section 2.4. connection: Unix domain socket forwarding
|
|
// https://github.com/openssh/openssh-portable/blob/master/PROTOCOL#L235
|
|
type streamLocalChannelOpenDirectMsg struct {
|
|
socketPath string
|
|
reserved0 string
|
|
reserved1 uint32
|
|
}
|
|
|
|
// forwardedStreamLocalPayload is a struct used for SSH_MSG_CHANNEL_OPEN message
|
|
// with "forwarded-streamlocal@openssh.com" string.
|
|
type forwardedStreamLocalPayload struct {
|
|
SocketPath string
|
|
Reserved0 string
|
|
}
|
|
|
|
// streamLocalChannelForwardMsg is a struct used for SSH2_MSG_GLOBAL_REQUEST message
|
|
// with "streamlocal-forward@openssh.com"/"cancel-streamlocal-forward@openssh.com" string.
|
|
type streamLocalChannelForwardMsg struct {
|
|
socketPath string
|
|
}
|
|
|
|
// ListenUnix is similar to ListenTCP but uses a Unix domain socket.
|
|
func (c *Client) ListenUnix(socketPath string) (net.Listener, error) {
|
|
m := streamLocalChannelForwardMsg{
|
|
socketPath,
|
|
}
|
|
// send message
|
|
ok, _, err := c.SendRequest("streamlocal-forward@openssh.com", true, Marshal(&m))
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if !ok {
|
|
return nil, errors.New("ssh: streamlocal-forward@openssh.com request denied by peer")
|
|
}
|
|
ch := c.forwards.add(&net.UnixAddr{Name: socketPath, Net: "unix"})
|
|
|
|
return &unixListener{socketPath, c, ch}, nil
|
|
}
|
|
|
|
func (c *Client) dialStreamLocal(socketPath string) (Channel, error) {
|
|
msg := streamLocalChannelOpenDirectMsg{
|
|
socketPath: socketPath,
|
|
}
|
|
ch, in, err := c.OpenChannel("direct-streamlocal@openssh.com", Marshal(&msg))
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
go DiscardRequests(in)
|
|
return ch, err
|
|
}
|
|
|
|
type unixListener struct {
|
|
socketPath string
|
|
|
|
conn *Client
|
|
in <-chan forward
|
|
}
|
|
|
|
// Accept waits for and returns the next connection to the listener.
|
|
func (l *unixListener) Accept() (net.Conn, error) {
|
|
s, ok := <-l.in
|
|
if !ok {
|
|
return nil, io.EOF
|
|
}
|
|
ch, incoming, err := s.newCh.Accept()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
go DiscardRequests(incoming)
|
|
|
|
return &chanConn{
|
|
Channel: ch,
|
|
laddr: &net.UnixAddr{
|
|
Name: l.socketPath,
|
|
Net: "unix",
|
|
},
|
|
raddr: &net.UnixAddr{
|
|
Name: "@",
|
|
Net: "unix",
|
|
},
|
|
}, nil
|
|
}
|
|
|
|
// Close closes the listener.
|
|
func (l *unixListener) Close() error {
|
|
// this also closes the listener.
|
|
l.conn.forwards.remove(&net.UnixAddr{Name: l.socketPath, Net: "unix"})
|
|
m := streamLocalChannelForwardMsg{
|
|
l.socketPath,
|
|
}
|
|
ok, _, err := l.conn.SendRequest("cancel-streamlocal-forward@openssh.com", true, Marshal(&m))
|
|
if err == nil && !ok {
|
|
err = errors.New("ssh: cancel-streamlocal-forward@openssh.com failed")
|
|
}
|
|
return err
|
|
}
|
|
|
|
// Addr returns the listener's network address.
|
|
func (l *unixListener) Addr() net.Addr {
|
|
return &net.UnixAddr{
|
|
Name: l.socketPath,
|
|
Net: "unix",
|
|
}
|
|
}
|