Skip to content

Commit 0f3288b

Browse files
authored
Removed Changelog from the landing page and have the app version on the top menu as a link directing to the changelog page(#606)
* Made changelog div container scrollable to avoid page elongation Signed-off-by: Vanessa Fotso <[email protected]> * update draft release schedule Signed-off-by: Vanessa Fotso <[email protected]> * update vulcan setup to also load the sample data Signed-off-by: Vanessa Fotso <[email protected]> * Updated features, added release info and test user to the readme Signed-off-by: Vanessa Fotso <[email protected]> * Removed changelog from landing page and cleanup unused methods & dependency Signed-off-by: Vanessa Fotso <[email protected]> * Updated setup and readme Signed-off-by: Vanessa Fotso <[email protected]> --------- Signed-off-by: Vanessa Fotso <[email protected]>
1 parent 1fd6915 commit 0f3288b

File tree

7 files changed

+46
-55
lines changed

7 files changed

+46
-55
lines changed

.github/workflows/create-draft-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Create Release Draft
22

33
on:
44
schedule:
5-
- cron: "0 0 */14 * *" # Every 14 days at midnight (format: "`min(0 - 59)` `hr(0 - 23)` `day of month(1 - 31)` `month(1 - 12) ` `day of week(0 - 6)`")
5+
- cron: "0 17 */14 * *" # Every 14 days at 17:00 (format: "`min(0 - 59)` `hr(0 - 23)` `day of month(1 - 31)` `month(1 - 12) ` `day of week(0 - 6)`")
66

77
jobs:
88
create_release_draft:

Gemfile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,6 @@ gem 'rubyzip'
6868
gem 'mitre-inspec-objects'
6969
gem 'rest-client'
7070

71-
# Markdown processing
72-
gem 'redcarpet'
73-
7471
group :development do
7572
gem 'listen', '~> 3.1.5'
7673
# Access an interactive console on exception pages or by calling 'console' anywhere in the code.

Gemfile.lock

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,6 @@ GEM
350350
rb-fsevent (0.11.1)
351351
rb-inotify (0.10.1)
352352
ffi (~> 1.0)
353-
redcarpet (3.6.0)
354353
regexp_parser (2.2.1)
355354
request_store (1.5.1)
356355
rack (>= 1.4)
@@ -565,7 +564,6 @@ DEPENDENCIES
565564
pg (>= 0.18, < 2.0)
566565
puma (~> 5.6)
567566
rails (~> 6.1.4)
568-
redcarpet
569567
rest-client
570568
rspec-mocks
571569
rspec-rails (~> 4.0.0)

README.md

Lines changed: 41 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,30 +11,50 @@ Vulcan models the STIG intent form and the process of aligning security controls
1111
* Model the STIG creation process between the creator (vendor) and the approver (sponsor)
1212
* Write and test InSpec code on a local system, or across SSH, AWS, and Docker targets
1313
* Easily view control status and revision history
14-
* Enable distributed authorship with multiple authors working on sets of controls and reviewing each others' work
14+
* Enable distributed authorship with multiple authors working on sets of controls and reviewing each others' work.
15+
* Enable looking up related controls (controls using the same SRG ID) in published STIGs while auhtoring or reviewing a control.
16+
* View DISA published STIG Contents.
1517
* Confidential data in the database is encrypted using symmetric encryption
1618
* Authenticate via the local server, through GitHub, and through configuring an LDAP server.
19+
* Email and Slack notification enabled
20+
21+
## Latest Release: [v2.1.4](https://github.com/mitre/vulcan/releases/tag/v2.1.4)
22+
23+
You can pull the Docker image for the latest release with the following command:
24+
25+
```bash
26+
docker pull mitre/vulcan:v2.1.4
27+
```
28+
29+
For more details on this release and previous ones, check the [Changelog](https://vulcan.mitre.org/CHANGELOG.html).
1730

1831
## Deploy Vulcan
32+
1933
[Deploying Vulcan in Production](https://vulcan.mitre.org/docs/)&nbsp;&nbsp;&nbsp;[<img src="public/GitHub-Mark-Light-64px.png#gh-dark-mode-only" width="20"/>](https://pages.github.com/)[<img src="public/GitHub-Mark-64px.png#gh-light-mode-only" width="20"/>](https://pages.github.com/)
2034

21-
## Deployment Dependencies:
35+
## Deployment Dependencies
36+
2237
For Ruby (on Ubuntu):
23-
* Ruby
24-
* `build-essentials`
25-
* Bundler
26-
* `libq-dev`
27-
* nodejs
38+
39+
* Ruby
40+
* `build-essentials`
41+
* Bundler
42+
* `libq-dev`
43+
* nodejs
2844

2945
### Run With Ruby
3046

3147
#### Setup Ruby
3248

3349
1. Install the version of Ruby specified in `.ruby-version`
3450
2. Install postgres and rbenv
35-
3. gem install foreman
36-
4. rbenv install
37-
5. bin/setup
51+
3. Run `gem install foreman`
52+
4. Run `rbenv install`
53+
5. Run `bin/setup`
54+
55+
>> **Note**: `bin/setup` will install the JS dependencies andprepare the database.
56+
57+
6. Run `rails db:seed` to seed the database.
3858

3959
#### Running with Ruby
4060

@@ -44,12 +64,19 @@ Make sure you have run the setup steps at least once before following these step
4464
2. foreman start -f Procfile.dev
4565
3. Navigate to `http://127.0.0.1:3000`
4666

67+
#### Test User
68+
69+
For testing purposes in the development environment, you can use the following credentials:
70+
71+
**Email**: <[email protected]>
72+
73+
**Password**: 1234567ab!
74+
4775
#### Stopping Vulcan
4876

4977
1. Stop Vulcan by doing `ctrl + c`
5078
2. Stop the postgres server
5179

52-
5380
## Configuration
5481

5582
See `docker-compose.yml` for container configuration options.
@@ -87,6 +114,9 @@ and the impact on the application's performance when deciding on the frequency.
87114

88115
>> Please refer to your hosting platform's documentation or support services for specific instructions on how to set up scheduled tasks or cron jobs.
89116
117+
## Releasing Vulcan
118+
119+
For detailed information about creating a release, please refer to the [release documentation](https://github.com/mitre/vulcan/wiki/Release_vulcan).
90120

91121
### NOTICE
92122

@@ -105,4 +135,3 @@ This software was produced for the U. S. Government under Contract Number HHSM-5
105135
No other use other than that granted to the U. S. Government, or to those acting on behalf of the U. S. Government under that Clause is authorized without the express written permission of The MITRE Corporation.
106136

107137
For further information, please contact The MITRE Corporation, Contracts Management Office, 7515 Colshire Drive, McLean, VA 22102-7539, (703) 983-6000.
108-

app/helpers/application_helper.rb

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -21,39 +21,4 @@ def base_navigation
2121

2222
nav_links
2323
end
24-
25-
# Get the latest release changes to display on the landing page
26-
def latest_release_details
27-
changelog_path = Rails.root.join('CHANGELOG.md')
28-
release_details = ''
29-
30-
begin
31-
File.open(changelog_path, 'r') do |file|
32-
line = file.gets
33-
while line
34-
if line.start_with?('## [v')
35-
# Found the beginning of a release, start reading details
36-
release_details = line
37-
line = file.gets
38-
while line && !line.start_with?('## [v')
39-
release_details += line
40-
line = file.gets
41-
end
42-
# Exit the loop once the latest release details have been read
43-
break
44-
end
45-
line = file.gets
46-
end
47-
end
48-
rescue StandardError => e
49-
Rails.logger.error "Unable to read latest release: #{e.message}"
50-
end
51-
52-
release_details
53-
end
54-
55-
def markdown_to_html(text)
56-
options = %i[hard_wrap autolink no_intra_emphasis fenced_code_blocks]
57-
Markdown.new(text, *options).to_html
58-
end
5924
end

app/javascript/components/navbar/App.vue

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33
<b-navbar toggleable="lg" type="dark" variant="dark">
44
<b-navbar-brand id="heading" href="/">
55
<i class="mdi mdi-radar" aria-hidden="true" />
6-
VULCAN <span class="latest-release">{{ currentVersion }}</span>
6+
VULCAN
7+
<b-link href="https://vulcan.mitre.org/CHANGELOG.html" target="_blank">
8+
<span class="latest-release">{{ currentVersion }}</span>
9+
</b-link>
710
</b-navbar-brand>
811
<b-navbar-toggle target="nav-collapse" />
912

app/views/devise/shared/_what_is_vulcan.html.haml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,3 @@
22

33
%p Vulcan helps Subject Matter Experts (SMEs) apply Security Requirements Guides (SRGs) to author Security Technical Implementation Guides (STIGs) & corresponding InSpec Profiles as security testing content.
44
%p=Settings['welcome_text']
5-
%div.mt-4=markdown_to_html(latest_release_details).html_safe

0 commit comments

Comments
 (0)