Multi-client servers + bring back stdinserver support

This commit is contained in:
Christian Schwarz
2018-09-04 16:41:54 -07:00
parent e161347e47
commit 308e5e35fb
12 changed files with 356 additions and 71 deletions
+3 -3
View File
@@ -165,7 +165,7 @@ type SSHStdinserverConnect struct {
IdentityFile string `yaml:"identity_file"`
TransportOpenCommand []string `yaml:"transport_open_command,optional"` //TODO unused
SSHCommand string `yaml:"ssh_command,optional"` //TODO unused
Options []string `yaml:"options"`
Options []string `yaml:"options,optional"`
DialTimeout time.Duration `yaml:"dial_timeout,positive,default=10s"`
}
@@ -190,13 +190,13 @@ type TLSServe struct {
Ca string `yaml:"ca"`
Cert string `yaml:"cert"`
Key string `yaml:"key"`
ClientCN string `yaml:"client_cn"`
ClientCNs []string `yaml:"client_cns"`
HandshakeTimeout time.Duration `yaml:"handshake_timeout,positive,default=10s"`
}
type StdinserverServer struct {
ServeCommon `yaml:",inline"`
ClientIdentity string `yaml:"client_identity"`
ClientIdentities []string `yaml:"client_identities"`
}
type PruningEnum struct {
+3 -1
View File
@@ -8,7 +8,9 @@ jobs:
ca: "ca.pem"
cert: "cert.pem"
key: "key.pem"
client_cn: "laptop1"
client_cns:
- "laptop1"
- "homeserver"
global:
logging:
- type: "tcp"
+3 -1
View File
@@ -3,7 +3,9 @@ jobs:
type: source
serve:
type: stdinserver
client_identity: "client1"
client_identities:
- "client1"
- "client2"
filesystems: {
"<": true,
"secret": false