Fixes OpenAPI generation

agentprotocol/NewForwardCtx.go

@@ -3,13 +3,13 @@ package agentprotocol
 import (
 	"io"
 
-    log "go.containerssh.io/libcontainerssh/log"
+	log "go.containerssh.io/libcontainerssh/log"
 )
 
 func NewForwardCtx(fromBackend io.Reader, toBackend io.Writer, logger log.Logger) *ForwardCtx {
 	return &ForwardCtx{
 		fromBackend: fromBackend,
-		toBackend: toBackend,
-		logger: logger,
+		toBackend:   toBackend,
+		logger:      logger,
 	}
-}
+}

agentprotocol/Protocol.go

@@ -1,15 +1,15 @@
 package agentprotocol
 
 const (
-	CONNECTION_TYPE_X11 = iota
-	CONNECTION_TYPE_PORT_FORWARD = iota
-	CONNECTION_TYPE_PORT_DIAL = iota
+	CONNECTION_TYPE_X11            = iota
+	CONNECTION_TYPE_PORT_FORWARD   = iota
+	CONNECTION_TYPE_PORT_DIAL      = iota
 	CONNECTION_TYPE_SOCKET_FORWARD = iota
-	CONNECTION_TYPE_SOCKET_DIAL = iota
+	CONNECTION_TYPE_SOCKET_DIAL    = iota
 )
 
 const (
-	PROTOCOL_TCP string = "tcp"
+	PROTOCOL_TCP  string = "tcp"
 	PROTOCOL_UNIX string = "unix"
 )
 
@@ -24,10 +24,10 @@ const (
 )
 
 type SetupPacket struct {
-	ConnectionType   uint32
-	BindHost         string
-	BindPort         uint32
-	Protocol         string
+	ConnectionType uint32
+	BindHost       string
+	BindPort       uint32
+	Protocol       string
 
 	Screen           string
 	SingleConnection bool
@@ -36,16 +36,16 @@ type SetupPacket struct {
 }
 
 type NewConnectionPayload struct {
-	Protocol          string
-	
+	Protocol string
+
 	ConnectedAddress  string
 	ConnectedPort     uint32
 	OriginatorAddress string
 	OriginatorPort    uint32
 }
 
 type Packet struct {
-	Type int
+	Type         int
 	ConnectionId uint64
-	Payload []byte
+	Payload      []byte
 }

agentprotocol/server.go

@@ -6,9 +6,9 @@ import (
 	"sync"
 	"time"
 
-    log "go.containerssh.io/libcontainerssh/log"
-    message "go.containerssh.io/libcontainerssh/message"
 	"github.com/fxamacker/cbor/v2"
+	log "go.containerssh.io/libcontainerssh/log"
+	message "go.containerssh.io/libcontainerssh/message"
 )
 
 const (

agentprotocol/server_test.go

@@ -5,9 +5,9 @@ import (
 	"io"
 	"testing"
 
-    proto "go.containerssh.io/libcontainerssh/agentprotocol"
+	proto "go.containerssh.io/libcontainerssh/agentprotocol"
 
-    log "go.containerssh.io/libcontainerssh/log"
+	log "go.containerssh.io/libcontainerssh/log"
 )
 
 // region Tests

auditlog/codec/Decoder.go

@@ -1,7 +1,7 @@
 package codec
 
 import (
-    internalCodec "go.containerssh.io/libcontainerssh/internal/auditlog/codec"
+	internalCodec "go.containerssh.io/libcontainerssh/internal/auditlog/codec"
 )
 
 // Decoder is a module that is resonsible for decoding a binary testdata stream into audit log messages.

auditlog/message/channelrequest.go

@@ -100,7 +100,7 @@ func (p PayloadChannelRequestPty) Equals(other Payload) bool {
 }
 
 type PayloadChannelRequestX11 struct {
-	RequestID        uint64 `json:"requestId" yaml:"requestId"`
+	RequestID uint64 `json:"requestId" yaml:"requestId"`
 
 	SingleConnection bool   `json:"singleConnection" yaml:"singleConnection"`
 	AuthProtocol     string `json:"authProtocol" yaml:"authProtocol"`

auditlog/message/globalrequest.go

@@ -29,4 +29,4 @@ func (p PayloadGlobalRequestDecodeFailed) Equals(other Payload) bool {
 		return false
 	}
 	return p.RequestID == p2.RequestID && p.RequestType == p2.RequestType && p.Reason == p2.Reason
-}
+}

auditlog/storage/factory.go

@@ -1,10 +1,10 @@
 package storage
 
 import (
-    "go.containerssh.io/libcontainerssh/config"
-    "go.containerssh.io/libcontainerssh/internal/auditlog"
-    "go.containerssh.io/libcontainerssh/log"
-    "go.containerssh.io/libcontainerssh/message"
+	"go.containerssh.io/libcontainerssh/config"
+	"go.containerssh.io/libcontainerssh/internal/auditlog"
+	"go.containerssh.io/libcontainerssh/log"
+	"go.containerssh.io/libcontainerssh/message"
 )
 
 func New(cfg config.AuditLogConfig, logger log.Logger) (Storage, error) {

auditlog/storage/storage.go

@@ -1,7 +1,7 @@
 package storage
 
 import (
-    "go.containerssh.io/libcontainerssh/internal/auditlog/storage"
+	"go.containerssh.io/libcontainerssh/internal/auditlog/storage"
 )
 
 type Storage interface {

auth/protocol.go

@@ -1,18 +1,20 @@
 package auth
 
 import (
-    "go.containerssh.io/libcontainerssh/metadata"
+	"go.containerssh.io/libcontainerssh/metadata"
 )
 
 // PasswordAuthRequest is an authentication request for password authentication.
 //
 // swagger:model PasswordAuthRequest
 type PasswordAuthRequest struct {
+	// swagger:allOf
 	metadata.ConnectionAuthPendingMetadata `json:",inline"`
 
 	// Password the user provided for authentication.
 	//
 	// required: true
+	// in: body
 	// swagger:strfmt Base64
 	Password string `json:"passwordBase64"`
 }
@@ -21,8 +23,11 @@ type PasswordAuthRequest struct {
 //
 // swagger:model PublicKeyAuthRequest
 type PublicKeyAuthRequest struct {
+	// swagger:allOf
 	metadata.ConnectionAuthPendingMetadata `json:",inline"`
 
+	// in: body
+	// required: true
 	PublicKey `json:",inline"`
 }
 
@@ -32,14 +37,24 @@ type PublicKeyAuthRequest struct {
 //
 // swagger:model AuthorizationRequest
 type AuthorizationRequest struct {
+	// swagger:allOf
 	metadata.ConnectionAuthenticatedMetadata `json:",inline"`
 }
 
 // ResponseBody is a response to authentication requests.
 //
 // swagger:model AuthResponseBody
 type ResponseBody struct {
-	metadata.ConnectionAuthenticatedMetadata `json:",inline"`
+	metadata.DynamicMetadata `json:",inline"`
+
+	// AuthenticatedUsername contains the username that was actually verified. This may differ from LoginUsername when,
+	// for example OAuth2 or Kerberos authentication is used. This field is empty until the authentication phase is
+	// completed.
+	//
+	// required: false
+	// in: body
+	// example: systemusername
+	AuthenticatedUsername string `json:"authenticatedUsername,omitempty"`
 
 	// Success indicates if the authentication was successful.
 	//
@@ -55,5 +70,6 @@ type Response struct {
 	// The response body
 	//
 	// in: body
-	ResponseBody
+	// required: true
+	Body ResponseBody
 }

auth/pubkey.go

@@ -5,5 +5,6 @@ type PublicKey struct {
 	// PublicKey is the key in the authorized key format.
 	//
 	// required: true
+	// example: ssh-rsa ...
 	PublicKey string `json:"publicKey"`
 }

auth/webhook/client.go

@@ -1,13 +1,13 @@
 package webhook
 
 import (
-    auth2 "go.containerssh.io/libcontainerssh/auth"
-    "go.containerssh.io/libcontainerssh/config"
-    "go.containerssh.io/libcontainerssh/internal/auth"
-    "go.containerssh.io/libcontainerssh/internal/geoip/dummy"
-    "go.containerssh.io/libcontainerssh/internal/metrics"
-    "go.containerssh.io/libcontainerssh/log"
-    "go.containerssh.io/libcontainerssh/metadata"
+	auth2 "go.containerssh.io/libcontainerssh/auth"
+	"go.containerssh.io/libcontainerssh/config"
+	"go.containerssh.io/libcontainerssh/internal/auth"
+	"go.containerssh.io/libcontainerssh/internal/geoip/dummy"
+	"go.containerssh.io/libcontainerssh/internal/metrics"
+	"go.containerssh.io/libcontainerssh/log"
+	"go.containerssh.io/libcontainerssh/metadata"
 )
 
 type Client interface {

auth/webhook/handler.go

@@ -1,7 +1,7 @@
 package webhook
 
 import (
-    "go.containerssh.io/libcontainerssh/internal/auth"
+	"go.containerssh.io/libcontainerssh/internal/auth"
 )
 
 // AuthRequestHandler describes the methods an authentication server has to implement in order to be usable with the

auth/webhook/handler_factory.go

@@ -3,8 +3,8 @@ package webhook
 import (
 	"net/http"
 
-    "go.containerssh.io/libcontainerssh/internal/auth"
-    "go.containerssh.io/libcontainerssh/log"
+	"go.containerssh.io/libcontainerssh/internal/auth"
+	"go.containerssh.io/libcontainerssh/log"
 )
 
 // NewHandler creates a HTTP handler that forwards calls to the provided h config request handler.

auth/webhook/server.go

@@ -1,10 +1,10 @@
 package webhook
 
 import (
-    "go.containerssh.io/libcontainerssh/config"
-    "go.containerssh.io/libcontainerssh/http"
-    "go.containerssh.io/libcontainerssh/internal/auth"
-    "go.containerssh.io/libcontainerssh/log"
+	"go.containerssh.io/libcontainerssh/config"
+	"go.containerssh.io/libcontainerssh/http"
+	"go.containerssh.io/libcontainerssh/internal/auth"
+	"go.containerssh.io/libcontainerssh/log"
 )
 
 // NewServer returns a complete HTTP server that responds to the authentication requests.

auth/webhook/server_test.go

@@ -5,12 +5,12 @@ import (
 	"os"
 	"time"
 
-    auth2 "go.containerssh.io/libcontainerssh/auth"
-    "go.containerssh.io/libcontainerssh/auth/webhook"
-    "go.containerssh.io/libcontainerssh/config"
-    "go.containerssh.io/libcontainerssh/log"
-    "go.containerssh.io/libcontainerssh/metadata"
-    "go.containerssh.io/libcontainerssh/service"
+	auth2 "go.containerssh.io/libcontainerssh/auth"
+	"go.containerssh.io/libcontainerssh/auth/webhook"
+	"go.containerssh.io/libcontainerssh/config"
+	"go.containerssh.io/libcontainerssh/log"
+	"go.containerssh.io/libcontainerssh/metadata"
+	"go.containerssh.io/libcontainerssh/service"
 )
 
 // myAuthReqHandler is your handler for authentication requests.

cmd/containerssh-auditlog-decoder/main.go

@@ -7,7 +7,7 @@ import (
 	"log"
 	"os"
 
-    "go.containerssh.io/libcontainerssh/auditlog/codec"
+	"go.containerssh.io/libcontainerssh/auditlog/codec"
 )
 
 func main() {