-
Notifications
You must be signed in to change notification settings - Fork 189
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.
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
Use file name numbering on kit upload instead of overwriting files with the same name #1213
Open
caitmich
wants to merge
13
commits into
develop
Choose a base branch
from
fix-overwriting-kit-upload
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
4b26ee2
add suffix to duplicate template names instead of overwriting them
caitmich 29482ba
changelog
caitmich 3545279
store configured template directories in a hash to be dynamically acc…
caitmich 8a80cc0
Rename variable for clarity
aapomm 4782e29
Consolidate to import_templates method and use consistent pathnames
aapomm d66616c
Merge branch 'develop' into fix-overwriting-kit-upload
aapomm 7eef02f
Merge branch 'develop' of github.com:dradis/dradis-ce into fix-overwr…
caitmich a1a47e4
Merge branch 'develop' of github.com:dradis/dradis-ce into fix-overwr…
caitmich b2d9276
extract file naming to helper, remove plugins step from job and specs
caitmich 4e7c20c
add kit upload macros and simplify specs
caitmich c4ef859
use exist instead of file.file?
caitmich 742c1be
remove plugins from spec setup and use file.file?
caitmich 3fffcf1
fix specs by adding methodology content
caitmich File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
module KitUploadMacros | ||
extend ActiveSupport::Concern | ||
|
||
def setup_kit_import | ||
file = File.new(Rails.root.join('spec', 'fixtures', 'files', 'templates', 'kit.zip')) | ||
@tmp_dir = Rails.root.join('tmp', 'rspec') | ||
FileUtils.mkdir_p @tmp_dir | ||
|
||
# Use a temporary file for the job instead of the original fixture | ||
FileUtils.cp file.path, @tmp_dir | ||
@tmp_file = File.new(@tmp_dir.join('kit.zip')) | ||
|
||
['methodologies', 'notes', 'projects', 'reports'].each do |item| | ||
conf = Configuration.find_or_initialize_by(name: "admin:paths:templates:#{item}") | ||
folder = @tmp_dir.join(item) | ||
conf.value = folder | ||
conf.save! | ||
FileUtils.mkdir_p folder | ||
end | ||
|
||
allow(NoteTemplate).to receive(:pwd).and_return( | ||
Pathname.new(Configuration.paths_templates_notes) | ||
) | ||
allow(Methodology).to receive(:pwd).and_return( | ||
Pathname.new(Configuration.paths_templates_methodologies) | ||
) | ||
allow(ProjectTemplate).to receive(:pwd).and_return( | ||
Pathname.new(Configuration.paths_templates_projects) | ||
) | ||
end | ||
|
||
def cleanup_kit_import | ||
FileUtils.rm_rf(Dir.glob(Attachment.pwd + '*')) | ||
FileUtils.rm_rf(Rails.root.join('tmp', 'rspec')) | ||
Configuration.delete_by('name LIKE ?', 'admin:paths:%') | ||
end | ||
end |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If you want to 🤓 out, you can do this in a single SQL query, by prebuilding the names from the TEMPLATE_TYPEs.