mirror of
https://github.com/versity/versitygw.git
synced 2026-08-17 20:56:21 +00:00
Fixes #1327 Fixes #1567 Closes #2264 Wires the S3 gateway up to the standalone IAM service so identity policies, not just bucket policies and ACLs, are enforced on the S3 data plane. The gateway authenticates SigV4 requests by calling new private derive-signing-key and resolve-identity endpoints on the IAM service instead of holding secrets itself, and evaluates identity policy through the same PolicyEvaluator path added to auth.VerifyAccess, combined with the bucket policy using explicit-deny-wins precedence. The private endpoints are served over their own mTLS listener (new iamapi/private package, genmtlscerts.sh to generate test material, and client-cert support in internal/netutil), separate from the public IAM API. As part of this the vendored aws/signer/v4 package is deleted and replaced by a pure-Go SigV4 implementation in internal/sigv4auth, which now reads canonical request data directly off the fiber.Ctx instead of reconstructing an http.Request, and is shared by both the S3 request-signing verification and the new private-endpoint signing. DeleteObjects moves from an all-or-nothing authorization check to true partial success: VerifyObjectsAccess evaluates every object in a batch independently against both the identity policy and any object lock, so a denial or a locked object only removes that key from the batch instead of failing the whole request. It also batches the identity-policy round trip and the bucket-policy fetch once per request rather than once per object, and separates plain deletes from versioned ones since a versioned delete needs s3:DeleteObjectVersion rather than s3:DeleteObject. Object lock handling got a few correctness fixes alongside this: a bypass is now modeled as BypassNone/BypassRequested/BypassOverwrite rather than a single bool, because root's blanket ability to override a GOVERNANCE retention should only apply when the client actually asked to bypass it (DeleteObject/DeleteObjects/PutObjectRetention), not when the gateway is silently replacing a locked object via an overwrite, which needs the permission from everyone including root. Retention changes are now correctly classified as an extension (allowed under plain s3:PutObjectRetention) versus a weakening (date or mode change, which needs the bypass permission), and a COMPLIANCE lock can never be weakened by anyone regardless of permissions, matching AWS. Separately, VerifyObjectCopyAccess had a readonly-mode gap: it returned early for root/admin before ever calling VerifyAccess, so the readonly check inside VerifyAccess never ran for them on CopyObject; access checks are now ordered so the readonly gate always applies before any root/admin bypass, for copy as well as every other write path. Bucket policies also gained Condition block support, via a new shared internal/condition package moved out of the IAM policy package since both bucket and identity policies share the same evaluation semantics. It implements the full AWS operator set — String{Equals,NotEquals,EqualsIgnoreCase,NotEqualsIgnoreCase,Like,NotLike}, Numeric{Equals,NotEquals,LessThan,LessThanEquals,GreaterThan,GreaterThanEquals}, Date{Equals,NotEquals,LessThan,LessThanEquals,GreaterThan,GreaterThanEquals}, Bool, BinaryEquals, Arn{Equals,Like,NotEquals,NotLike}, IpAddress/NotIpAddress, and Null — along with the ForAllValues/ForAnyValue set qualifiers and the IfExists modifier. A new requestConditionContext builds the per-request keys a bucket policy's Condition block can reference — aws:SourceIp, aws:SecureTransport, aws:CurrentTime, aws:EpochTime, aws:UserAgent, aws:Referer, s3:prefix, s3:delimiter, s3:max-keys, s3:x-amz-acl, s3:VersionId — following AWS's own per-action rules for which keys a given S3 operation actually populates. Identity-derived keys such as aws:PrincipalArn and aws:username are deliberately left unwired here, since the gateway has no way to know them; the standalone IAM service fills those in itself when it evaluates an identity policy. Also added new integration test suites for S3-side IAM: s3_iam_access_control.go and s3_iam_session_access_control.go cover identity-policy enforcement and session-credential requests against real S3 operations, alongside expanded OIDC/web-identity coverage and a new runoidctests.sh runner wired into the OIDC GitHub Actions workflow.
120 lines
4.0 KiB
Go
120 lines
4.0 KiB
Go
// Copyright 2026 Versity Software
|
|
// This file is licensed under the Apache License, Version 2.0
|
|
// (the "License"); you may not use this file except in compliance
|
|
// with the License. You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package private
|
|
|
|
import (
|
|
"errors"
|
|
"net/http"
|
|
|
|
"github.com/gofiber/fiber/v3"
|
|
"github.com/versity/versitygw/debuglogger"
|
|
"github.com/versity/versitygw/iamapi/internal/iamutil"
|
|
)
|
|
|
|
// Error codes carried in the JSON error body's "code" field. The S3
|
|
// gateway maps them to distinct S3 errors — CodeNoSuchIdentity to
|
|
// InvalidAccessKeyId, CodeInvalidToken to InvalidToken — so an end user
|
|
// gets an accurate diagnosis instead of one catch-all. Without them every
|
|
// 403 looks identical on the wire, and a gateway whose own IAM-client
|
|
// credential was rotated would tell the *user* their access key doesn't
|
|
// exist.
|
|
const (
|
|
CodeNoSuchIdentity = "NoSuchIdentity"
|
|
CodeInvalidToken = "InvalidToken"
|
|
CodeBadRequest = "BadRequest"
|
|
)
|
|
|
|
// privateAPIError is a minimal local error for failures (like a malformed
|
|
// request body) that don't map to any of iamerr's AWS-IAM-specific error
|
|
// codes — this protocol is plain JSON, not the rest of iamapi's
|
|
// AWS-Query/XML wire format, so there's no need to force every error
|
|
// through iamerr.APIError's XML-rendering machinery.
|
|
type privateAPIError struct {
|
|
status int
|
|
code string
|
|
message string
|
|
}
|
|
|
|
func (e *privateAPIError) Error() string { return e.message }
|
|
func (e *privateAPIError) StatusCode() int { return e.status }
|
|
func (e *privateAPIError) Code() string { return e.code }
|
|
|
|
var (
|
|
errMalformedRequestBody = &privateAPIError{
|
|
status: http.StatusBadRequest,
|
|
code: CodeBadRequest,
|
|
message: "malformed request body",
|
|
}
|
|
errNoSuchIdentity = &privateAPIError{
|
|
status: http.StatusForbidden,
|
|
code: CodeNoSuchIdentity,
|
|
message: "no identity for the given access key id",
|
|
}
|
|
errInvalidSessionToken = &privateAPIError{
|
|
status: http.StatusForbidden,
|
|
code: CodeInvalidToken,
|
|
message: "the given session token is missing, invalid, or does not belong to the given access key id",
|
|
}
|
|
)
|
|
|
|
// mapResolveError translates iamutil's identity-resolution sentinels into
|
|
// the wire errors this protocol reports. Anything unrecognized falls through
|
|
// unchanged and renders as a 500, which is the correct signal: it is a fault
|
|
// in the IAM service, not a problem with the caller's identity.
|
|
func mapResolveError(err error) error {
|
|
switch {
|
|
case errors.Is(err, iamutil.ErrIdentityNotFound):
|
|
return errNoSuchIdentity
|
|
case errors.Is(err, iamutil.ErrInvalidSessionToken):
|
|
return errInvalidSessionToken
|
|
default:
|
|
return err
|
|
}
|
|
}
|
|
|
|
// coder is implemented by errors carrying a stable machine-readable code
|
|
// for the "code" field of the JSON error body.
|
|
type coder interface {
|
|
Code() string
|
|
}
|
|
|
|
// statusCoder is satisfied by both iamerr.APIError (used by
|
|
// iammiddleware.VerifyRootOnlySigV4) and privateAPIError, so errorHandler
|
|
// can extract the right HTTP status from either without depending on
|
|
// iamerr's XML-specific interface methods.
|
|
type statusCoder interface {
|
|
StatusCode() int
|
|
}
|
|
|
|
// errorHandler renders any error as a small JSON body with the matching
|
|
// HTTP status (defaulting to 500 for an error with no known status) and,
|
|
// where the error carries one, a machine-readable code the S3 gateway
|
|
// dispatches on.
|
|
func (p *PrivateAPI) errorHandler(ctx fiber.Ctx, err error) error {
|
|
status := http.StatusInternalServerError
|
|
if sc, ok := err.(statusCoder); ok {
|
|
status = sc.StatusCode()
|
|
} else {
|
|
debuglogger.InternalError(err)
|
|
}
|
|
|
|
body := map[string]string{"error": err.Error()}
|
|
if c, ok := err.(coder); ok {
|
|
body["code"] = c.Code()
|
|
}
|
|
|
|
ctx.Status(status)
|
|
return ctx.JSON(body)
|
|
}
|