All error messages generated via the logging mechanisms of the Docker
Enterprise Edition engine are displayed such that they meet the
requirements of this control. Only users that are authorized the
appropriate level of access can view these error messages.
+
@@ -1017,11 +1021,11 @@ The information system implements [Assignment: organization-defined security saf
**Implemenation Details:**
-
+
Docker Enterprise Edition can be installed on the following operating systems:
CentOS 7.1+, Red Hat Enterprise Linux 7.0+, Ubuntu 14.04 LTS+, and
SUSE Linux Enterprise 12+. In order to meet the requirements of this
@@ -1029,6 +1033,7 @@ control, reference the chosen operating system's security
documentation for information regarding the protection of memory from
unauthorized code execution.
+
diff --git a/docs/generator/generator.go b/docs/generator/generator.go
index ecb677b..2f58adb 100644
--- a/docs/generator/generator.go
+++ b/docs/generator/generator.go
@@ -112,7 +112,7 @@ func iterateControls(family string, familyTitle string, controls []XMLControl, i
id := xid.New()
// Format narratives
- // **Need to clean up narrative links
+ // **Break out in to separate function
narratives := make([]string, len(satisfy.GetNarratives()))
narrativeLinks := []string{}
for _, narrative := range satisfy.GetNarratives() {
@@ -123,19 +123,20 @@ func iterateControls(family string, familyTitle string, controls []XMLControl, i
narrativeText = strings.Replace(narrativeText, "''", "'", -1)
}
narrativeLinksIndex := strings.Index(narrativeText, "- http")
- if narrativeLinksIndex >= 0 {
- narrativeLinks = strings.Split(narrativeText[narrativeLinksIndex:], "\n")
- for i, link := range narrativeLinks {
- if strings.Index(link, "- ") >= 0 {
- narrativeLinks[i] = link[strings.Index(link, "- ")+2:]
+
+ if narrativeLinksIndex != -1 {
+ splitNarrativeFromLinks := strings.Split(narrativeText[narrativeLinksIndex:], "\n")
+ narrativeText = narrativeText[:narrativeLinksIndex]
+ for _, link := range splitNarrativeFromLinks {
+ linkIndex := strings.Index(link, "- ")
+ if linkIndex != -1 {
+ narrativeLinks = append(narrativeLinks, link[linkIndex+2:])
}
}
}
narratives = append(narratives, narrativeText)
}
- fmt.Println(narrativeLinks)
-
markdownTemplateControl.Components = append(markdownTemplateControl.Components, MarkdownTemplateComponent{
ID: id.String(),
Name: component.GetName(),
diff --git a/docs/generator/tmpl/80053.tmpl b/docs/generator/tmpl/80053.tmpl
index 1d05ce6..d42ba9b 100644
--- a/docs/generator/tmpl/80053.tmpl
+++ b/docs/generator/tmpl/80053.tmpl
@@ -86,7 +86,16 @@ will be rejected.
{{else -}}
{{end -}}
-{{range $component.Narratives}}{{ . }}{{end}}
+{{range $component.Narratives -}}
+{{ . -}}
+{{end -}}
+{{if $component.NarrativeLinks}}
+
+{{range $component.NarrativeLinks -}}
+- {{ . }}
+{{end -}}
+{{end}}
+
{{end -}}
diff --git a/opencontrol/components/eNZi/component.yaml b/opencontrol/components/eNZi/component.yaml
index 1f7d9db..b70a6e1 100644
--- a/opencontrol/components/eNZi/component.yaml
+++ b/opencontrol/components/eNZi/component.yaml
@@ -21,11 +21,8 @@ satisfies:
managed to enforce fine-grained access control. Supporting
documentation can found at the following resources:
- UCP:
- https://docs.docker.com/datacenter/ucp/2.1/guides/admin/manage-users/
- https://docs.docker.com/datacenter/ucp/2.1/guides/admin/manage-users/permission-levels/
-
- DTR:
- https://docs.docker.com/datacenter/dtr/2.2/guides/admin/manage-users/
- https://docs.docker.com/datacenter/dtr/2.2/guides/admin/manage-users/permission-levels/
standard_key: NIST-800-53