DRONE_TRUSTED_ENVIRONMENT Env variable added:

cmd/drone-server/config/config.go

@@ -231,13 +231,14 @@ type (
 
  // Server provides the server configuration.
  Server struct {
- Addr string `envconfig:"-"`
- Host string `envconfig:"DRONE_SERVER_HOST" default:"localhost:8080"`
- Port string `envconfig:"DRONE_SERVER_PORT" default:":8080"`
- Proto string `envconfig:"DRONE_SERVER_PROTO" default:"http"`
- Acme bool `envconfig:"DRONE_TLS_AUTOCERT"`
- Cert string `envconfig:"DRONE_TLS_CERT"`
- Key string `envconfig:"DRONE_TLS_KEY"`
+ Addr string `envconfig:"-"`
+ Host string `envconfig:"DRONE_SERVER_HOST" default:"localhost:8080"`
+ Port string `envconfig:"DRONE_SERVER_PORT" default:":8080"`
+ Proto string `envconfig:"DRONE_SERVER_PROTO" default:"http"`
+ Acme bool `envconfig:"DRONE_TLS_AUTOCERT"`
+ Cert string `envconfig:"DRONE_TLS_CERT"`
+ Key string `envconfig:"DRONE_TLS_KEY"`
+ Trusted bool `envconfig:"DRONE_TRUSTED_ENVIRONMENT"`
  }
 
  // Proxy provides proxy server configuration.

cmd/drone-server/inject_service.go

@@ -49,14 +49,14 @@ var serviceSet = wire.NewSet(
  orgs.New,
  parser.New,
  pubsub.New,
- repo.New,
  token.Renewer,
  trigger.New,
  user.New,
 
  provideContentService,
  provideDatadog,
  provideHookService,
+ provideRepositoryService,
  provideNetrcService,
  provideSession,
  provideStatusService,
@@ -78,6 +78,12 @@ func provideHookService(client *scm.Client, renewer core.Renewer, config config.
  return hook.New(client, config.Proxy.Addr, renewer)
 }
 
+// provideRepositoryService is a Wire provider function that returns a
+// repository service based on the environment configuration.
+func provideRepositoryService(client *scm.Client, renewer core.Renewer, config config.Config) core.RepositoryService {
+ return repo.New(client, renewer, config.Server.Trusted)
+}
+
 // provideNetrcService is a Wire provider function that returns
 // a netrc service based on the environment configuration.
 func provideNetrcService(client *scm.Client, renewer core.Renewer, config config.Config) core.NetrcService {

service/repo/repo.go

@@ -22,16 +22,18 @@ import (
 )
 
 type service struct {
- renew core.Renewer
- client *scm.Client
+ renew core.Renewer
+ client *scm.Client
+ trustedEnvironment bool
 }
 
 // New returns a new Repository service, providing access to the
 // repository information from the source code management system.
-func New(client *scm.Client, renewer core.Renewer) core.RepositoryService {
+func New(client *scm.Client, renewer core.Renewer, trustedEnvironment bool) core.RepositoryService {
  return &service{
- renew: renewer,
- client: client,
+ renew: renewer,
+ client: client,
+ trustedEnvironment: trustedEnvironment,
  }
 }
 
@@ -52,8 +54,9 @@ func (s *service) List(ctx context.Context, user *core.User) ([]*core.Repository
  if err != nil {
  return nil, err
  }
+
  for _, src := range result {
- repos = append(repos, convertRepository(src))
+ repos = append(repos, convertRepository(src, s.trustedEnvironment))
  }
  opts.Page = meta.Page.Next
  opts.URL = meta.Page.NextURL
@@ -79,7 +82,7 @@ func (s *service) Find(ctx context.Context, user *core.User, repo string) (*core
  if err != nil {
  return nil, err
  }
- return convertRepository(result), nil
+ return convertRepository(result, s.trustedEnvironment), nil
 }
 
 func (s *service) FindPerm(ctx context.Context, user *core.User, repo string) (*core.Perm, error) {

service/repo/repo_test.go

@@ -8,9 +8,9 @@ import (
  "context"
  "testing"
 
+ "github.com/drone/drone/core"
  "github.com/drone/drone/mock"
  "github.com/drone/drone/mock/mockscm"
- "github.com/drone/drone/core"
  "github.com/drone/go-scm/scm"
  "github.com/google/go-cmp/cmp"
 
@@ -38,7 +38,7 @@ func TestFind(t *testing.T) {
  client := new(scm.Client)
  client.Repositories = mockRepoService
 
- service := New(client, mockRenewer)
+ service := New(client, mockRenewer, false)
 
  want := &core.Repository{
  Namespace: "octocat",
@@ -71,7 +71,7 @@ func TestFind_Err(t *testing.T) {
  client := new(scm.Client)
  client.Repositories = mockRepoService
 
- service := New(client, mockRenewer)
+ service := New(client, mockRenewer, false)
  _, err := service.Find(noContext, mockUser, "octocat/hello-world")
  if err != scm.ErrNotFound {
  t.Errorf("Expect not found error, got %v", err)
@@ -87,7 +87,7 @@ func TestFind_RefreshErr(t *testing.T) {
  mockRenewer := mock.NewMockRenewer(controller)
  mockRenewer.EXPECT().Renew(gomock.Any(), mockUser, false).Return(scm.ErrNotAuthorized)
 
- service := New(nil, mockRenewer)
+ service := New(nil, mockRenewer, false)
  _, err := service.Find(noContext, mockUser, "octocat/hello-world")
  if err == nil {
  t.Errorf("Expect error refreshing token")
@@ -114,7 +114,7 @@ func TestFindPerm(t *testing.T) {
  client := new(scm.Client)
  client.Repositories = mockRepoService
 
- service := New(client, mockRenewer)
+ service := New(client, mockRenewer, false)
 
  want := &core.Perm{
  Read: true,
@@ -146,7 +146,7 @@ func TestFindPerm_Err(t *testing.T) {
  client := new(scm.Client)
  client.Repositories = mockRepoService
 
- service := New(client, mockRenewer)
+ service := New(client, mockRenewer, false)
  _, err := service.FindPerm(noContext, mockUser, "octocat/hello-world")
  if err != scm.ErrNotFound {
  t.Errorf("Expect not found error, got %v", err)
@@ -162,7 +162,7 @@ func TestFindPerm_RefreshErr(t *testing.T) {
  mockRenewer := mock.NewMockRenewer(controller)
  mockRenewer.EXPECT().Renew(gomock.Any(), mockUser, false).Return(scm.ErrNotAuthorized)
 
- service := New(nil, mockRenewer)
+ service := New(nil, mockRenewer, false)
  _, err := service.FindPerm(noContext, mockUser, "octocat/hello-world")
  if err == nil {
  t.Errorf("Expect error refreshing token")
@@ -199,7 +199,7 @@ func TestList(t *testing.T) {
  },
  }
 
- service := New(client, mockRenewer)
+ service := New(client, mockRenewer, false)
  got, err := service.List(noContext, mockUser)
  if err != nil {
  t.Error(err)
@@ -224,7 +224,7 @@ func TestList_Err(t *testing.T) {
  client := new(scm.Client)
  client.Repositories = mockRepoService
 
- service := New(client, mockRenewer)
+ service := New(client, mockRenewer, false)
  _, err := service.List(noContext, mockUser)
  if err != scm.ErrNotAuthorized {
  t.Errorf("Want not authorized error, got %v", err)
@@ -240,7 +240,7 @@ func TestList_RefreshErr(t *testing.T) {
  mockRenewer := mock.NewMockRenewer(controller)
  mockRenewer.EXPECT().Renew(gomock.Any(), mockUser, false).Return(scm.ErrNotAuthorized)
 
- service := New(nil, mockRenewer)
+ service := New(nil, mockRenewer, false)
  _, err := service.List(noContext, mockUser)
  if err == nil {
  t.Errorf("Expect error refreshing token")

service/repo/util.go

@@ -22,7 +22,7 @@ import (
 // convertRepository is a helper function that converts a
 // repository from the source code management system to the
 // local datastructure.
-func convertRepository(src *scm.Repository) *core.Repository {
+func convertRepository(src *scm.Repository, TrustedEnvironment bool) *core.Repository {
  return &core.Repository{
  UID: src.ID,
  Namespace: src.Namespace,
@@ -34,6 +34,7 @@ func convertRepository(src *scm.Repository) *core.Repository {
  Private: src.Private,
  Visibility: convertVisibility(src),
  Branch: src.Branch,
+ Trusted: TrustedEnvironment,
  }
 }
 

service/repo/util_test.go

@@ -36,7 +36,7 @@ func TestConvertRepository(t *testing.T) {
  Branch: "master",
  Visibility: core.VisibilityPrivate,
  }
- got := convertRepository(from)
+ got := convertRepository(from, false)
  if diff := cmp.Diff(want, got); len(diff) != 0 {
  t.Errorf(diff)
  }