Skip to content
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

fix unreachable host keyrings #238

Merged
merged 2 commits into from
Jan 19, 2024
Merged

fix unreachable host keyrings #238

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4993e0f
apt: reverse enable logic
paulcacheux Jan 17, 2024
6dadf0b
check is signed by is reachable
paulcacheux Jan 17, 2024
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
61 changes: 45 additions & 16 deletions apt/apt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,28 +259,57 @@ func NewBackend(target *types.Target, aptConfigDir string, logger types.Logger)
}

for i, repo := range repoList {
if repo.Enabled && !repo.SourceRepo {
prefix := target.Distro.Display
repoID := fmt.Sprintf("%s-%d", prefix, i)
if !repo.Enabled || repo.SourceRepo {
continue
}

var components []string
if repo.Components != "" {
components = strings.Split(repo.Components, " ")
}
if isSignedByUnreachableKey(repo) {
continue
}

remoteRepo, err := deb.NewRemoteRepo(repoID, repo.URI, repo.Distribution, components, []string{debArch}, false, false, false)
if err != nil {
return nil, err
}
prefix := target.Distro.Display
repoID := fmt.Sprintf("%s-%d", prefix, i)

if err := backend.repoCollection.Add(remoteRepo); err != nil {
backend.Close()
return nil, fmt.Errorf("failed to add collection: %w", err)
}
var components []string
if repo.Components != "" {
components = strings.Split(repo.Components, " ")
}

backend.logger.Debugf("Added repository '%s' %s %s %v %v", repoID, repo.URI, repo.Distribution, components, debArch)
remoteRepo, err := deb.NewRemoteRepo(repoID, repo.URI, repo.Distribution, components, []string{debArch}, false, false, false)
if err != nil {
return nil, err
}

if err := backend.repoCollection.Add(remoteRepo); err != nil {
backend.Close()
return nil, fmt.Errorf("failed to add collection: %w", err)
}

backend.logger.Debugf("Added repository '%s' %s %s %v %v", repoID, repo.URI, repo.Distribution, components, debArch)
}

return backend, nil
}

func isSignedByUnreachableKey(repo *Repository) bool {
if repo.Options == "" {
return false
}

options := strings.Split(repo.Options, " ")
for _, opt := range options {
optName, optValue, found := strings.Cut(opt, "=")
if !found {
continue
}

if strings.ToLower(optName) == "signed-by" {
// if the key is not in `/etc/*` then we cannot reach it
if !strings.HasPrefix(optValue, "/etc") {
return true
}
}
}

return false
}
Loading