Skip to content

Commit

Permalink
Add name validation for projects (#3658)
Browse files Browse the repository at this point in the history
This allows for simple alphanumeric and DNS names to be considered valid
for projects. The intention is to be able to use `/` in the future as a
separator to traverse project hierarchies and to simplify project naming
conventions.

Signed-off-by: Juan Antonio Osorio <[email protected]>
  • Loading branch information
JAORMX authored Jun 19, 2024
1 parent 6e6c00c commit bd376ce
Show file tree
Hide file tree
Showing 4 changed files with 131 additions and 0 deletions.
4 changes: 4 additions & 0 deletions internal/controlplane/handlers_projects.go
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,10 @@ func (s *Server) CreateProject(
return nil, util.UserVisibleError(codes.InvalidArgument, "cannot create subproject of a subproject")
}

if err := projects.ValidateName(req.Name); err != nil {
return nil, util.UserVisibleError(codes.InvalidArgument, "invalid project name: %v", err)
}

subProject, err := qtx.CreateProject(ctx, db.CreateProjectParams{
Name: req.Name,
ParentID: uuid.NullUUID{
Expand Down
4 changes: 4 additions & 0 deletions internal/projects/creator.go
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,10 @@ func (p *projectCreator) ProvisionSelfEnrolledProject(
projectName string,
userSub string,
) (outproj *db.Project, projerr error) {
if ValidateName(projectName) != nil {
return nil, fmt.Errorf("invalid project name: %w", ErrValidationFailed)
}

projectmeta := NewSelfEnrolledMetadata(projectName)

jsonmeta, err := json.Marshal(&projectmeta)
Expand Down
37 changes: 37 additions & 0 deletions internal/projects/meta.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ package projects

import (
"encoding/json"
"fmt"
"regexp"
"strings"

"github.com/stacklok/minder/internal/db"
)
Expand All @@ -27,6 +30,11 @@ const (
MinderMetadataVersion = "v1alpha1"
)

var (
// ErrValidationFailed is returned when a project fails validation
ErrValidationFailed = fmt.Errorf("validation failed")
)

// Metadata contains metadata relevant for a project.
type Metadata struct {
Version string `json:"version"`
Expand Down Expand Up @@ -77,6 +85,35 @@ func ParseMetadata(proj *db.Project) (*Metadata, error) {
return &meta, nil
}

// ValidateName validates the given project name.
func ValidateName(name string) error {
if name == "" {
return fmt.Errorf("%w: name cannot be empty", ErrValidationFailed)
}

if strings.Contains(name, "/") {
return fmt.Errorf("%w: name cannot contain '/'", ErrValidationFailed)
}

// Check if the name is too long.
if len(name) > 63 {
return fmt.Errorf("%w: name is too long", ErrValidationFailed)
}

// Attempt to match against alphanumeric characters only
alphanumr := regexp.MustCompile(`^[a-zA-Z0-9](?:[-_a-zA-Z0-9]{0,61}[a-zA-Z0-9])?$`)
if !alphanumr.MatchString(name) {
// Attempt to match against a valid DNS name
r := regexp.MustCompile(`^(?:(?:[a-zA-Z0-9](?:[a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z0-9][a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])$`)

if !r.MatchString(name) {
return fmt.Errorf("%w: name must be a valid DNS name or an alphanumeric sequence", ErrValidationFailed)
}
}

return nil
}

// SerializeMetadata serializes the given Metadata object into JSON.
func SerializeMetadata(meta *Metadata) ([]byte, error) {
return json.Marshal(meta)
Expand Down
86 changes: 86 additions & 0 deletions internal/projects/meta_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
//
// Copyright 2024 Stacklok, Inc.
//
// 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 projects contains utilities for working with projects.
package projects

import (
"strings"
"testing"

"github.com/stretchr/testify/require"
)

func TestValidateName(t *testing.T) {
t.Parallel()

type args struct {
name string
}
tests := []struct {
name string
args args
wantErr bool
}{
{
name: "valid name",
args: args{name: "valid-name"},
wantErr: false,
},
{
name: "valid name with numbers",
args: args{name: "valid-name-123"},
wantErr: false,
},
{
name: "valid DNS name",
args: args{name: "valid-name-123.stacklok.com"},
wantErr: false,
},
{
name: "invalid name",
args: args{name: "invalid name"},
wantErr: true,
},
{
name: "empty name",
args: args{name: ""},
wantErr: true,
},
{
name: "name too long",
// 65 characters
args: args{name: strings.Repeat("a", 65)},
wantErr: true,
},
{
name: "slash in the name",
args: args{name: "name/with/slash"},
wantErr: true,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
t.Parallel()

err := ValidateName(tt.args.name)
if tt.wantErr {
require.Error(t, err)
} else {
require.NoError(t, err)
}
})
}
}

0 comments on commit bd376ce

Please sign in to comment.