Delete report format dirs last when deleting a user #1368
Merged
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.
What:
When deleting a user, to avoid having to roll back the movement of the report format dirs, delete the dirs absolutely last. That is, delete dirs after all SQL has run, in case any of that SQL fails.
Why:
Errors in the SQL were leaving the report format dirs in an inconsistent state.
How did you test it:
gvmd --create-user=webadmin --password=w --role=Admin
gvmd --modify-setting 78eceaec-3385-11ea-b237-28d24461215b --value UUID_OF_webadmin
(set feed owner to webadmin)create table refs (id SERIAL PRIMARY KEY, owner integer REFERENCES users (id) ON DELETE RESTRICT);
insert into refs (owner) values ((select id from users where name = 'webadmin'));
ls var/lib/gvm/gvmd/report_formats/
=> 5 filesgvmd --delete-user=webadmin --inheritor=user2
(should fail due to refs)ls var/lib/gvm/gvmd/report_formats/
=> still 5 filesgvmd --delete-user=webadmin
(should fail due to refs)ls var/lib/gvm/gvmd/report_formats/
=> still 5 filesdelete from refs;
Checklist: