Skip to content
This repository has been archived by the owner on Jul 26, 2019. It is now read-only.

Commit

Permalink
Finish updating vendored libs
Browse files Browse the repository at this point in the history
Signed-off-by: Nassim 'Nass' Eddequiouaq <eddequiouaq.nassim@gmail.com>
  • Loading branch information
n4ss committed Dec 21, 2017
1 parent 3e1fbcb commit b8b5b0c
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 6 deletions.
3 changes: 2 additions & 1 deletion defaults/api_ents.go
Expand Up @@ -4,9 +4,10 @@ import (
"fmt"
"strings"

"github.com/sirupsen/logrus"
"github.com/moby/libentitlement/entitlement"
"github.com/moby/libentitlement/secprofile"

"github.com/sirupsen/logrus"
)

const (
Expand Down
1 change: 0 additions & 1 deletion defaults/security_ents.go
Expand Up @@ -164,7 +164,6 @@ func securityAdminEntitlementEnforce(profile secprofile.Profile) (secprofile.Pro
osdefs.SysQuotactl,
osdefs.SysGetpmsg,
osdefs.SysPutpmsg,

}
ociProfile.AllowSyscalls(syscallsToAllow...)

Expand Down
1 change: 1 addition & 0 deletions defaults/security_ents_test.go
Expand Up @@ -7,6 +7,7 @@ import (
"github.com/moby/libentitlement/secprofile/osdefs"
"github.com/moby/libentitlement/testutils"
"github.com/moby/libentitlement/types"

"github.com/opencontainers/runtime-spec/specs-go"
"github.com/stretchr/testify/require"
)
Expand Down
3 changes: 2 additions & 1 deletion domain/domain.go
Expand Up @@ -4,8 +4,9 @@ import (
"fmt"
"strings"

"github.com/sirupsen/logrus"
"github.com/moby/libentitlement/parser"

"github.com/sirupsen/logrus"
)

// Domain defines the scoping for entitlements, ie Network
Expand Down
4 changes: 2 additions & 2 deletions parser/parser.go
Expand Up @@ -2,10 +2,11 @@ package parser

import (
"fmt"
"github.com/sirupsen/logrus"
"regexp"
"strconv"
"strings"

"github.com/sirupsen/logrus"
)

// FIXME: refactor shared code between each Parse[..]Entitlement functions
Expand Down Expand Up @@ -124,6 +125,5 @@ func ParseStringEntitlement(entitlementFormat string) (domain []string, id, valu
}

// FIXME: should we add constraints on the allowed characters in entitlement parameters and check integrity?

return
}
3 changes: 2 additions & 1 deletion secprofile/oci_profile.go
Expand Up @@ -3,10 +3,11 @@ package secprofile
import (
"reflect"

"github.com/sirupsen/logrus"
"github.com/moby/libentitlement/apparmor"
"github.com/moby/libentitlement/types"

"github.com/opencontainers/runtime-spec/specs-go"
"github.com/sirupsen/logrus"
)

// APIID is the API identifier type
Expand Down

0 comments on commit b8b5b0c

Please sign in to comment.