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.

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

Remove mimetype associations from package #1160

Merged
merged 1 commit into from
Oct 27, 2020
Merged

Remove mimetype associations from package #1160

merged 1 commit into from
Oct 27, 2020

Conversation

conorsch
Copy link
Contributor

@conorsch conorsch commented Oct 19, 2020

Description

As part of template consolidation [0], we've moved all mimetype
associations into the "securedrop-workstation-config" package [1].
The "open-in-dvm" desktop file now resides in the same package [2].

[0] freedomofpress/securedrop-workstation#471
[1] freedomofpress/securedrop-builder#190
[2] freedomofpress/securedrop-builder#198

Strictly speaking, the changes in freedomofpress/securedrop-builder#198 are sufficient to remove the duplicate files from the "securedrop-client" package. Still, as a matter of housekeeping, we should remove the files from the tarball, since we've already dropped them from the packaging logic.

Test Plan

See detailed test procedure in freedomofpress/securedrop-workstation#619

CI will fail until freedomofpress/securedrop-builder#198 is merged. We should merge that PR first, then restart CI here to confirm everything's green.

@conorsch
Copy link
Contributor Author

Note that CI is failing here, due to the unmerged packaging logic. Happy to tack on a "temporary" commit, as in https://github.com/freedomofpress/securedrop-export/pull/65/commits, to aid in review, if desired.

conorsch pushed a commit to freedomofpress/securedrop-apt-test that referenced this pull request Oct 22, 2020
Removes mimetypes, given that they're now provided in
`securedrop-workstation-config`. See corresponding changes in:

  * freedomofpress/securedrop-client#1160
  * freedomofpress/securedrop-builder#198
conorsch pushed a commit to freedomofpress/securedrop-builder that referenced this pull request Oct 22, 2020
Specifically to remove mimetypes, see related changes in
freedomofpress/securedrop-client#1160
@emkll
Copy link
Contributor

emkll commented Oct 22, 2020

Changes here look good to me and CI appears to be passing in the commit view

Once these changes are merged, when a user runs the updater, sd-app-buster-template will be updated with the changes introduced in this branch. sd-app-buster-template will update to securedrop-client 0.2.2 with no mimeapps.list in /usr/share/applications (removed in this PR) and mimeapps specification in home directory (requires salt state). This means that if a user manually navigates to a file, it is likely the distribution-default handler will open the file in the same VM. This will only be resolved when the end user runs the salt state against all VMs (sdw-admin --apply).
This has no impact to the client, but i think it would be prudent to ship a "safe" default in /usr/share/applications via the securedrop-config package. The challenge with that approach will be overriding this "safe" default in the viewer VMs, since they have the config package installed and they should open the files using normal associations

The client version update to 0.2.1 -> 0.2.2 will be required for template consolidation, but we can do it in a separate PR to prepare for release.

@sssoleileraaa
Copy link
Contributor

The client version update to 0.2.1 -> 0.2.2 will be required for template consolidation, but we can do it in a separate PR to prepare for release.

Doing a client release in a separate PR with a tracking issue sounds good to me too. Once this is merged we can tag the client off of main and build and release.

As part of template consolidation [0], we've moved all mimetype
associations into the "securedrop-workstation-config" package [1].
The "open-in-dvm" desktop file now resides in the same package [2].

[0] freedomofpress/securedrop-workstation#471
[1] freedomofpress/securedrop-builder#190
[2] freedomofpress/securedrop-builder#198
@conorsch
Copy link
Contributor Author

Doing a client release in a separate PR with a tracking issue sounds good to me too.

Roger that, @creviera. I've dropped the temporary commits, both the version bump & the CI quick-fix. The latter means that CI on this PR will fail until freedomofpress/securedrop-builder#198 is merged and CI is re-run here.

@conorsch conorsch marked this pull request as ready for review October 27, 2020 19:52
Copy link
Contributor

@emkll emkll left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After merging freedomofpress/securedrop-builder#206, CI is now passing. Changes here look good to me. As stated by @creviera in #1160 (comment), we will open a separate PR to bump versions and update changelog, in preparation for the client release. Prior to release/final qa, nightlies should cover the dev/staging scenarios.

@emkll emkll merged commit 1a9e4e3 into main Oct 27, 2020
@emkll emkll deleted the remove-mimetypes branch October 27, 2020 21:42
sssoleileraaa pushed a commit that referenced this pull request Oct 28, 2020
Remove mimetype associations from package
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants