* Adding explicit MPL license for sub-package. This directory and its subdirectories (packages) contain files licensed with the MPLv2 `LICENSE` file in this directory and are intentionally licensed separately from the BSL `LICENSE` file at the root of this repository. * Adding explicit MPL license for sub-package This directory and its subdirectories (packages) contain files licensed with the MPLv2 `LICENSE` file in this directory and are intentionally licensed separately from the BSL `LICENSE` file at the root of this repository. * Updating the license from MPL to Business Source License Going forward, this project will be licensed under the Business Source License v1.1. Please see our blog post for more details at https://hashi.co/bsl-blog, FAQ at www.hashicorp.com/licensing-faq, and details of the license at www.hashicorp.com/bsl. * Update copyright file headers to BUS-1.1 * Rerun make gen This will pick up the last of the license changes * Revert "Rerun make gen" This reverts commit dbe0968bffd92745d8663c6940debae098395a6b. * Remove copywrite from generation script The current version of copywrite is not sophisticated enough to only apply the copywrite changes to certain subdirectories, so to avoid accidentally relicensing our api and sdk modules, we will stop running the copywrite script until such time that it can do the right thing. * License protobuf API as MPL The protobuf API files are used to generate the SDK, since we want the SDK to be MPL, the protobuf files must also be MPL. This extends to all protobuf files whose sources end up in the SDK directory, including: - internal/proto/controller/api - internal/proto/controller/custom_options - internal/proto/plugin It also includes the generated service directory in internal/gen/controller/api/services, since they are generated from the protobuf sources used for the SDK. * Change website license file name This makes the naming scheme consistent with the rest of the repository. * Add note on licensing to README * Set copywrite license to BUSL * Revert "Add note on licensing to README" This reverts commit 4d865a91a7a4f11605f0dc4609355d7e3c3cfffe. --------- Co-authored-by: hashicorp-copywrite[bot] <110428419+hashicorp-copywrite[bot]@users.noreply.github.com> Co-authored-by: Johan Brandhorst-Satzkorn <johan.brandhorst@gmail.com>
86 lines
2.4 KiB
Go
86 lines
2.4 KiB
Go
// Copyright (c) HashiCorp, Inc.
|
|
// SPDX-License-Identifier: BUSL-1.1
|
|
|
|
package ssh
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
|
|
"github.com/hashicorp/boundary/internal/bsr"
|
|
pssh "github.com/hashicorp/boundary/internal/bsr/gen/ssh/v1"
|
|
"github.com/hashicorp/boundary/internal/bsr/internal/is"
|
|
gssh "golang.org/x/crypto/ssh"
|
|
"google.golang.org/protobuf/proto"
|
|
)
|
|
|
|
const X11RequestType = "x11"
|
|
|
|
// X11Request is a chunk to contain data for an SSH X11 request
|
|
type X11Request struct {
|
|
*bsr.BaseChunk
|
|
*pssh.X11Request
|
|
}
|
|
|
|
// MarshalData serializes an X11Request chunk
|
|
func (r *X11Request) MarshalData(ctx context.Context) ([]byte, error) {
|
|
const op = "ssh.(X11Request).MarshalData"
|
|
dataBytes, err := proto.Marshal(r.X11Request)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("%s: failed to marshal data: %w", op, err)
|
|
}
|
|
|
|
d := make([]byte, 0, len(dataBytes))
|
|
d = append(d, dataBytes...)
|
|
|
|
return d, nil
|
|
}
|
|
|
|
// NewX11Request creates an X11Request chunk
|
|
func NewX11Request(ctx context.Context, d bsr.Direction, t *bsr.Timestamp, r *gssh.Request) (*X11Request, error) {
|
|
const op = "ssh.NewX11Request"
|
|
|
|
if is.Nil(r) {
|
|
return nil, fmt.Errorf("%s: request cannot be nil: %w", op, bsr.ErrInvalidParameter)
|
|
}
|
|
if r.Type != X11RequestType {
|
|
return nil, fmt.Errorf("%s: request type must be %q: %w", op, X11RequestType, bsr.ErrInvalidParameter)
|
|
}
|
|
if !bsr.ValidDirection(d) {
|
|
return nil, fmt.Errorf("%s: invalid direction: %w", op, bsr.ErrInvalidParameter)
|
|
}
|
|
if is.Nil(t) {
|
|
return nil, fmt.Errorf("%s: timestamp cannot be nil: %w", op, bsr.ErrInvalidParameter)
|
|
}
|
|
|
|
baseChunk, err := bsr.NewBaseChunk(ctx, Protocol, d, t, X11ReqChunkType)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("%s: unable to create base chunk: %w", op, err)
|
|
}
|
|
|
|
var sigval x11Sigval
|
|
if err := gssh.Unmarshal(r.Payload, &sigval); err != nil {
|
|
return nil, fmt.Errorf("%s: unable to unmarshal payload: %w", op, err)
|
|
}
|
|
reqData := &X11Request{
|
|
BaseChunk: baseChunk,
|
|
X11Request: &pssh.X11Request{
|
|
RequestType: r.Type,
|
|
SenderChannel: sigval.SenderChannel,
|
|
InitialWindowSize: sigval.InitialWindowSize,
|
|
MaximumPacketSize: sigval.MaximumPacketSize,
|
|
OriginatorAddress: sigval.OriginatorAddress,
|
|
OriginatorPort: sigval.OriginatorPort,
|
|
},
|
|
}
|
|
return reqData, nil
|
|
}
|
|
|
|
type x11Sigval struct {
|
|
SenderChannel uint32
|
|
InitialWindowSize uint32
|
|
MaximumPacketSize uint32
|
|
OriginatorAddress string
|
|
OriginatorPort uint32
|
|
}
|