Skip to content

Conversation

@atomic111
Copy link
Member

update the CIS benchmark to 1.12 and add the tags to the controls

this will solve the issue #11 and #8

i will start with the debian and ubuntu test.

right now it is not tested for centos

Signed-off-by: Patrick Münch <patrick.muench1111@gmail.com>
Signed-off-by: Patrick Münch <patrick.muench1111@gmail.com>
Signed-off-by: Patrick Münch <patrick.muench1111@gmail.com>
Signed-off-by: Patrick Münch <patrick.muench1111@gmail.com>
ref 'https://docs.docker.com/installation/'
ref 'https://github.com/docker/docker/releases/latest'

docker_server_version = command('docker version --format \'{{.Server.Version}}\'').stdout
Copy link
Member

Choose a reason for hiding this comment

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

I am going to add docker.version to inspec/inspec#1566. This should make life easier in future.

Copy link
Member

Choose a reason for hiding this comment

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

This would result in

describe docker.version do
  it { should cmp >= '1.13.1'}
end

then. We can use this syntax, once the PR has been merged. We should not block this PR

Copy link
Member Author

Choose a reason for hiding this comment

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

yes, this is a great solution and makes it easier

describe auditd_rules do
its(:lines) { should include('-w /usr/bin/docker -p rwxa -k docker') }
end
describe service('auditd') do
Copy link
Member

Choose a reason for hiding this comment

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

Is it always auditd for the supported operating systems?

Copy link
Member Author

Choose a reason for hiding this comment

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

yes i agree, i test now with debian and will extened this to the other operating systems

@atomic111
Copy link
Member Author

i will need some time to complete this pr. sorry for a long time running pr

atomic111 added 10 commits April 4, 2017 11:14
Signed-off-by: Patrick Münch <patrick.muench1111@gmail.com>
Signed-off-by: Patrick Münch <patrick.muench1111@gmail.com>
Signed-off-by: Patrick Münch <patrick.muench1111@gmail.com>
Signed-off-by: Patrick Münch <patrick.muench1111@gmail.com>
Signed-off-by: Patrick Münch <patrick.muench1111@gmail.com>
Signed-off-by: Patrick Münch <patrick.muench1111@gmail.com>
…key, also update README.md

Signed-off-by: Patrick Münch <patrick.muench1111@gmail.com>
Signed-off-by: Patrick Münch <patrick.muench1111@gmail.com>
Signed-off-by: Patrick Münch <patrick.muench1111@gmail.com>
Signed-off-by: Patrick Münch <patrick.muench1111@gmail.com>
@atomic111 atomic111 changed the title WIP: update to CIS Benchmark 1.12 update to CIS Benchmark 1.12, controls 1.1 to 2.16 Apr 18, 2017
@atomic111 atomic111 added this to the cis benchmark 1.12 milestone Apr 18, 2017
Copy link
Member

@chris-rock chris-rock left a comment

Choose a reason for hiding this comment

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

Awesome improvement @atomic111 I have two minor requests

ref 'docker swarm init', url: 'https://docs.docker.com/engine/reference/commandline/swarm_init/'

describe command('docker info') do
its('stdout') { should include 'Swarm: inactive' }
Copy link
Member

Choose a reason for hiding this comment

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

Do we need a variable for this request?

end
end

control 'cis-docker-benchmark-2.15' do
Copy link
Member

Choose a reason for hiding this comment

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

should we externalize this into a swarm.rb, so that we get our normal component structure into our benchmark?

Copy link
Member Author

Choose a reason for hiding this comment

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

yes i agree, but we should include this in the 2.0 release. i opened a issue #21

Copy link
Member

Choose a reason for hiding this comment

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

Thank you @atomic111

Signed-off-by: Patrick Münch <patrick.muench1111@gmail.com>
@chris-rock chris-rock merged commit fa85337 into dev-sec:master Apr 18, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants