Skip to content

Commit 43362f7

Browse files
authored
Merge pull request #46 from dev-sec/chris-rock/metadata
update profile metadata & tooling
2 parents da3a1b6 + b5429ff commit 43362f7

6 files changed

Lines changed: 107 additions & 22 deletions

File tree

.rubocop.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,11 @@ AllCops:
44
- vendor/**/*
55
- "*/puppet/Puppetfile"
66
- "*/puppet/.tmp/**/*"
7+
TargetRubyVersion: 1.9
78
Documentation:
89
Enabled: false
910
AlignParameters:
1011
Enabled: true
11-
Encoding:
12-
Enabled: true
1312
HashSyntax:
1413
Enabled: true
1514
LineLength:
@@ -20,9 +19,11 @@ MethodLength:
2019
Max: 40
2120
NumericLiterals:
2221
MinDigits: 10
22+
Metrics/BlockLength:
23+
Max: 35
2324
Metrics/CyclomaticComplexity:
2425
Max: 10
2526
Metrics/PerceivedComplexity:
2627
Max: 10
2728
Metrics/AbcSize:
28-
Max: 29
29+
Max: 30

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ language: ruby
33
cache: bundler
44

55
rvm:
6-
- 1.9.3
7-
- 2.0.0
8-
- 2.2.0
6+
- 2.0
7+
- 2.2
8+
- 2.3.1
99

1010
bundler_args: --without integration
1111
script: bundle exec rake

CHANGELOG.md

Lines changed: 78 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,80 @@
1-
# Changelog
1+
# Change Log
22

3-
## 1.0.0
3+
## [2.0.1](https://github.com/dev-sec/linux-baseline/tree/2.0.1) (2016-12-21)
4+
[Full Changelog](https://github.com/dev-sec/linux-baseline/compare/2.0.0...2.0.1)
45

5-
* initial release with Deutsche Telekom compliance merged with many improvements on top
6+
**Closed issues:**
7+
8+
- permissions /etc/shadow [\#41](https://github.com/dev-sec/linux-baseline/issues/41)
9+
- False positives in control os-06 [\#40](https://github.com/dev-sec/linux-baseline/issues/40)
10+
11+
**Merged pull requests:**
12+
13+
- update Gemfile [\#43](https://github.com/dev-sec/linux-baseline/pull/43) ([atomic111](https://github.com/atomic111))
14+
- Update links in README file [\#42](https://github.com/dev-sec/linux-baseline/pull/42) ([netflash](https://github.com/netflash))
15+
- Fix cpu flags and change default for net.ipv4.conf.all.log\_martians [\#39](https://github.com/dev-sec/linux-baseline/pull/39) ([chris-rock](https://github.com/chris-rock))
16+
17+
## [2.0.0](https://github.com/dev-sec/linux-baseline/tree/2.0.0) (2016-04-29)
18+
[Full Changelog](https://github.com/dev-sec/linux-baseline/compare/1.3.0...2.0.0)
19+
20+
**Merged pull requests:**
21+
22+
- inspec profile [\#38](https://github.com/dev-sec/linux-baseline/pull/38) ([chris-rock](https://github.com/chris-rock))
23+
24+
## [1.3.0](https://github.com/dev-sec/linux-baseline/tree/1.3.0) (2016-04-25)
25+
[Full Changelog](https://github.com/dev-sec/linux-baseline/compare/1.1.0...1.3.0)
26+
27+
**Fixed bugs:**
28+
29+
- update identifier [\#37](https://github.com/dev-sec/linux-baseline/pull/37) ([chris-rock](https://github.com/chris-rock))
30+
31+
**Merged pull requests:**
32+
33+
- prevent nil in flags [\#36](https://github.com/dev-sec/linux-baseline/pull/36) ([arlimus](https://github.com/arlimus))
34+
- removed serverspec support and created all inspec tests [\#35](https://github.com/dev-sec/linux-baseline/pull/35) ([atomic111](https://github.com/atomic111))
35+
36+
## [1.1.0](https://github.com/dev-sec/linux-baseline/tree/1.1.0) (2015-10-15)
37+
[Full Changelog](https://github.com/dev-sec/linux-baseline/compare/1.0.0...1.1.0)
38+
39+
**Merged pull requests:**
40+
41+
- Remove whitespace [\#34](https://github.com/dev-sec/linux-baseline/pull/34) ([rndmh3ro](https://github.com/rndmh3ro))
42+
- Improve Ansible tests [\#33](https://github.com/dev-sec/linux-baseline/pull/33) ([rndmh3ro](https://github.com/rndmh3ro))
43+
- Fix typos [\#31](https://github.com/dev-sec/linux-baseline/pull/31) ([rndmh3ro](https://github.com/rndmh3ro))
44+
- update urls [\#30](https://github.com/dev-sec/linux-baseline/pull/30) ([chris-rock](https://github.com/chris-rock))
45+
- bugfix: add missing: ipv6 accept\_ra = 0 [\#29](https://github.com/dev-sec/linux-baseline/pull/29) ([arlimus](https://github.com/arlimus))
46+
- Ansible support [\#28](https://github.com/dev-sec/linux-baseline/pull/28) ([rndmh3ro](https://github.com/rndmh3ro))
47+
- add json format option [\#26](https://github.com/dev-sec/linux-baseline/pull/26) ([atomic111](https://github.com/atomic111))
48+
- Update common [\#25](https://github.com/dev-sec/linux-baseline/pull/25) ([arlimus](https://github.com/arlimus))
49+
- feature: add schroot to suid/sgid whitelist [\#24](https://github.com/dev-sec/linux-baseline/pull/24) ([arlimus](https://github.com/arlimus))
50+
- Update common [\#23](https://github.com/dev-sec/linux-baseline/pull/23) ([arlimus](https://github.com/arlimus))
51+
- updating common files [\#22](https://github.com/dev-sec/linux-baseline/pull/22) ([arlimus](https://github.com/arlimus))
52+
- changed GIS to DTAG SEC [\#21](https://github.com/dev-sec/linux-baseline/pull/21) ([atomic111](https://github.com/atomic111))
53+
- bugfix: lint error [\#20](https://github.com/dev-sec/linux-baseline/pull/20) ([chris-rock](https://github.com/chris-rock))
54+
55+
## [1.0.0](https://github.com/dev-sec/linux-baseline/tree/1.0.0) (2014-08-13)
56+
**Merged pull requests:**
57+
58+
- Lockdown mode [\#19](https://github.com/dev-sec/linux-baseline/pull/19) ([arlimus](https://github.com/arlimus))
59+
- split sysctl\_spec.rb, added suid whitliste and uid unique search [\#18](https://github.com/dev-sec/linux-baseline/pull/18) ([atomic111](https://github.com/atomic111))
60+
- added additional test [\#17](https://github.com/dev-sec/linux-baseline/pull/17) ([atomic111](https://github.com/atomic111))
61+
- add travis config, add default task to rakefile [\#16](https://github.com/dev-sec/linux-baseline/pull/16) ([ehaselwanter](https://github.com/ehaselwanter))
62+
- update rubocop, add common linter task, fix rubocop issues [\#15](https://github.com/dev-sec/linux-baseline/pull/15) ([ehaselwanter](https://github.com/ehaselwanter))
63+
- fix exec-shield test [\#14](https://github.com/dev-sec/linux-baseline/pull/14) ([chris-rock](https://github.com/chris-rock))
64+
- add lint rake task with robocop and fix issues [\#13](https://github.com/dev-sec/linux-baseline/pull/13) ([chris-rock](https://github.com/chris-rock))
65+
- added Telekom Security Requirement numbers to the corresponding kitchen test [\#12](https://github.com/dev-sec/linux-baseline/pull/12) ([atomic111](https://github.com/atomic111))
66+
- add ruby gem source [\#11](https://github.com/dev-sec/linux-baseline/pull/11) ([chris-rock](https://github.com/chris-rock))
67+
- add standalone usage feature [\#10](https://github.com/dev-sec/linux-baseline/pull/10) ([ehaselwanter](https://github.com/ehaselwanter))
68+
- serverspec has a contract on running commands remote. this fixes the local [\#9](https://github.com/dev-sec/linux-baseline/pull/9) ([ehaselwanter](https://github.com/ehaselwanter))
69+
- add lockfiles and delete them from tree [\#8](https://github.com/dev-sec/linux-baseline/pull/8) ([ehaselwanter](https://github.com/ehaselwanter))
70+
- rubocop fixes [\#7](https://github.com/dev-sec/linux-baseline/pull/7) ([ehaselwanter](https://github.com/ehaselwanter))
71+
- moved site.pp to the shared test, were it belongs [\#6](https://github.com/dev-sec/linux-baseline/pull/6) ([ehaselwanter](https://github.com/ehaselwanter))
72+
- bugfix: arp restrictions should apply to all, not just eth0 [\#5](https://github.com/dev-sec/linux-baseline/pull/5) ([arlimus](https://github.com/arlimus))
73+
- one folder level up [\#4](https://github.com/dev-sec/linux-baseline/pull/4) ([ehaselwanter](https://github.com/ehaselwanter))
74+
- Fix: change value of log\_martians to the cookbook default [\#3](https://github.com/dev-sec/linux-baseline/pull/3) ([atomic111](https://github.com/atomic111))
75+
- discard one level to be able to use the defaults in test-kitchen by just [\#2](https://github.com/dev-sec/linux-baseline/pull/2) ([ehaselwanter](https://github.com/ehaselwanter))
76+
- added tests from chef-os-hardening [\#1](https://github.com/dev-sec/linux-baseline/pull/1) ([ehaselwanter](https://github.com/ehaselwanter))
77+
78+
79+
80+
\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

Gemfile

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,9 @@
1-
# encoding: utf-8
2-
31
source 'https://rubygems.org'
42

5-
# pin dependency for Ruby 1.9.3 since bundler is not
6-
# detecting that net-ssh 3 does not work with 1.9.3
7-
if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new('1.9.3')
8-
gem 'net-ssh', '~> 2.9'
9-
end
10-
113
gem 'rake'
12-
gem 'inspec', '~> 0'
13-
gem 'rubocop', '~> 0.36.0'
4+
gem 'rack', '1.6.4'
5+
gem 'inspec', '~> 1'
6+
gem 'rubocop', '~> 0.44.0'
147
gem 'highline', '~> 1.6.0'
158

169
group :tools do

Rakefile

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,19 @@ namespace :test do
2424
sh("bundle exec inspec check #{dir}")
2525
end
2626
end
27+
28+
# Automatically generate a changelog for this project. Only loaded if
29+
# the necessary gem is installed. By default its picking up the version from
30+
# inspec.yml. You can override that behavior with s`rake changelog to=1.2.0`
31+
begin
32+
require 'yaml'
33+
metadata = YAML.load_file('inspec.yml')
34+
v = ENV['to'] || metadata['version']
35+
puts "Generate changelog for version #{v}"
36+
require 'github_changelog_generator/task'
37+
GitHubChangelogGenerator::RakeTask.new :changelog do |config|
38+
config.future_release = v
39+
end
40+
rescue LoadError
41+
puts '>>>>> GitHub Changelog Generator not loaded, omitting tasks'
42+
end

inspec.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
name: os-hardening
2-
title: Hardening Framework OS Hardening Test Suite
1+
name: linux-baseline
2+
title: DevSec Linux Security Baseline
33
maintainer: Hardening Framework Team
44
copyright: Hardening Framework Team
55
copyright_email: hello@hardening.io
66
license: Apache 2 license
77
summary: Test-suite for best-preactice os hardening
8-
version: 1.0.0
8+
version: 2.0.1
99
supports:
1010
- os-family: linux

0 commit comments

Comments
 (0)