Skip to content

Add authentication from config.json file #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
3r1co wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add authentication from config.json file #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fa4e4a0
Add authentication from config.json file
emuellen May 12, 2017
073b905
Add truncation for https
3r1co May 18, 2017
49004a9
Add support for HTTP
3r1co Aug 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 30 additions & 49 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,16 @@ limitations under the License.
package main

import (
"encoding/base64"
"fmt"
"github.com/alecthomas/kingpin"
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/service/ecr"
"github.com/docker/distribution/manifest/schema1"
"github.com/heroku/docker-registry-client/registry"
"io"
"io/ioutil"
"os"
"strings"

"github.com/alecthomas/kingpin"
"github.com/docker/distribution/manifest/schema1"
"github.com/fsouza/go-dockerclient"
"github.com/heroku/docker-registry-client/registry"
)

func moveLayerUsingFile(srcHub *registry.Registry, destHub *registry.Registry, srcRepo string, destRepo string, layer schema1.FSLayer, file *os.File) error {
Expand Down Expand Up @@ -81,10 +79,11 @@ func migrateLayer(srcHub *registry.Registry, destHub *registry.Registry, srcRepo
}

return err
} else {
fmt.Println("Layer already exists in the destination")
return nil
}

fmt.Println("Layer already exists in the destination")
return nil

}

type RepositoryArguments struct {
Expand Down Expand Up @@ -113,51 +112,28 @@ func buildRegistryArguments(argPrefix string, argDescription string) RepositoryA
}
}

func connectToRegistry(args RepositoryArguments) (*registry.Registry, error) {
origUrl := *args.RegistryURL
url := origUrl
username := ""
password := ""
func connectToRegistry(args RepositoryArguments, auths map[string]docker.AuthConfiguration) (*registry.Registry, error) {

if strings.HasPrefix(url, "ecr:") {
registryId := strings.TrimPrefix(url, "ecr:")
url := *args.RegistryURL
urlWithoutPrefix := strings.TrimPrefix(url, "https://")
urlWithoutPrefix = strings.TrimPrefix(url, "http://")

sess, err := session.NewSession()
if err != nil {
return nil, fmt.Errorf("Failed to create new AWS SDK session. %v", err)
}
svc := ecr.New(sess)
params := &ecr.GetAuthorizationTokenInput{
RegistryIds: []*string{
aws.String(registryId), // Required
},
}

resp, err := svc.GetAuthorizationToken(params)
if err != nil {
return nil, fmt.Errorf("Failed to get ECR authorization token for registry %s. %v", registryId, err)
}

decoded, err := base64.StdEncoding.DecodeString(*resp.AuthorizationData[0].AuthorizationToken)
if err != nil {
return nil, fmt.Errorf("Failed to decode base64 encoded authorization data for ECR registry %s. %v", registryId, err)
}

parts := strings.Split(string(decoded), ":")
username := ""
password := ""

url = *resp.AuthorizationData[0].ProxyEndpoint
username = parts[0]
password = parts[1]
if auth, ok := auths[urlWithoutPrefix]; ok {
username = auth.Username
password = auth.Password
}

registry, err := registry.New(url, username, password)
registry, err := registry.NewInsecure(url, username, password)

@mdlavin mdlavin May 18, 2017

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Switching to allow insecure connections seems like a dangerous thing to me. Can this be switched back to New instead?

if err != nil {
return nil, fmt.Errorf("Failed to create registry connection for %s. %v", origUrl, err)
return nil, fmt.Errorf("Failed to create registry connection for %s. %v", url, err)
}

err = registry.Ping()
if err != nil {
return nil, fmt.Errorf("Failed to to ping registry %s as a connection test. %v", origUrl, err)
return nil, fmt.Errorf("Failed to to ping registry %s as a connection test. %v", url, err)
}

return registry, nil
Expand All @@ -169,6 +145,11 @@ func main() {
os.Exit(exitCode)
}()

auths, err := docker.NewAuthConfigurationsFromDockerCfg()
if err != nil {
fmt.Printf("Couldn't read config.json in .docker folder\n")
}

srcArgs := buildRegistryArguments("src", "source")
destArgs := buildRegistryArguments("dest", "destiation")
repoArg := kingpin.Flag("repo", "The repository in the source and the destiation. Values provided by --srcRepo or --destTag will override this value").String()
Expand All @@ -190,25 +171,25 @@ func main() {
}

if *srcArgs.Repository == "" {
fmt.Printf("A source repository name is required either with --srcRepo or --repo")
fmt.Printf("A source repository name is required either with --srcRepo or --repo\n")
exitCode = -1
return
}

if *destArgs.Repository == "" {
fmt.Printf("A destiation repository name is required either with --destRepo or --repo")
fmt.Printf("A destiation repository name is required either with --destRepo or --repo\n")
exitCode = -1
return
}

srcHub, err := connectToRegistry(srcArgs)
srcHub, err := connectToRegistry(srcArgs, auths.Configs)
if err != nil {
fmt.Printf("Failed to establish a connection to the source registry. %v", err)
exitCode = -1
return
}

destHub, err := connectToRegistry(destArgs)
destHub, err := connectToRegistry(destArgs, auths.Configs)
if err != nil {
fmt.Printf("Failed to establish a connection to the destination registry. %v", err)
exitCode = -1
Expand Down
Loading