Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[VIRTS-4627] Add error message for restoring saved server state with incorrect encryption key #2797

Merged
merged 3 commits into from
Aug 2, 2023
Merged

[VIRTS-4627] Add error message for restoring saved server state with incorrect encryption key #2797

merged 3 commits into from
Aug 2, 2023

Conversation

bleepbop
Copy link
Contributor

Description

Adds error message and solution steps for when user attempts to restore server state from backup with different encryption keys.

Type of change

  • New feature (non-breaking change which adds functionality)

How Has This Been Tested?

Tested remediation steps with 3 different scenarios:

  • Scenario 1:
    • Start with --insecure
      • Stop server
      • State is stored w/ conf/default encryption key
      • Remove —insecure, run again
        • Error - fixed with remediation step 1
  • Scenario 2:
    • Start server w/o insecure
      • Stop server
      • Add —insecure, rerun server
        • Error - fixed with remediation step 2
  • Scenario 3:
    • Start server w/o insecure
      • Stop server
      • Delete local.yml
        • Error - fixed with remediation step 3

Checklist:

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have made corresponding changes to the documentation
  • I have added tests that prove my fix is effective or that my feature works

@bleepbop bleepbop requested a review from clenk July 27, 2023 14:17
@sonarcloud
Copy link

sonarcloud bot commented Jul 27, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

50.0% 50.0% Coverage
0.0% 0.0% Duplication

@clenk clenk requested a review from djlawren August 1, 2023 13:59
@sonarcloud
Copy link

sonarcloud bot commented Aug 2, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

50.0% 50.0% Coverage
0.0% 0.0% Duplication

@clenk clenk merged commit c1b9aa4 into master Aug 2, 2023
11 checks passed
@clenk clenk deleted the bleepbop/VIRTS-4627/improve-datastore-encryption-message branch August 2, 2023 15:01
BuildAndDestroy pushed a commit to BuildAndDestroy/caldera that referenced this pull request Oct 20, 2023
@bleepbop @clenk @BuildAndDestroy
catch invalid token exception, add error message for restoring encryp…
ccc06e9 
…ted server state (mitre#2797)

Co-authored-by: Chris Lenk <clenk@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@clenk clenk clenk approved these changes

@djlawren djlawren djlawren approved these changes

@elegantmoose elegantmoose Awaiting requested review from elegantmoose

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@bleepbop @clenk @djlawren