8000 Revert "tenant: open file to send utf-8 encoded" by ansasaki · Pull Request #1136 · keylime/keylime · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Revert "tenant: open file to send utf-8 encoded" #1136

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
Merged
merged 2 commits into from
Oct 25, 2022
Merged

Revert "tenant: open file to send utf-8 encoded" #1136

merged 2 commits into from
Oct 25, 2022

Conversation

ansasaki
Copy link
Contributor

This reverts commit a865889.

By restricting files to be sent to be utf-8 encoded, this commit made impossible to send zipped payloads using the tenant '-f' sub-option of the 'add' command.

Signed-off-by: Anderson Toshiyuki Sasaki ansasaki@redhat.com

@ansasaki
Revert "tenant: open file to send utf-8 encoded"
ee72e0a 
This reverts commit a865889.

By restricting files to be sent to be utf-8 encoded, this commit made
impossible to send zipped payloads using the tenant '-f' sub-option of
the 'add' command.

Signed-off-by: Anderson Toshiyuki Sasaki <ansasaki@redhat.com>
@ansasaki
Fix formatting using black
4e48321 
Signed-off-by: Anderson Toshiyuki Sasaki <ansasaki@redhat.com>
@codecov-commenter
Copy link
codecov-commenter commented Oct 21, 2022 •
edited
Loading

Codecov Report

Merging #1136 (4e48321) into master (f969d39) will decrease coverage by 5.81%.
The diff coverage is n/a.

Additional details and impacted files
Flag Coverage Δ
packit-e2e 66.35% <ø> (-6.07%) ⬇️
testsuite 54.13% <ø> (ø)
unittests 14.61% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
keylime/elchecking/example.py 20.00% <0.00%> (-74.00%) ⬇️
keylime/elchecking/tests.py 26.20% <0.00%> (-55.77%) ⬇️
keylime/tpm_ek_ca.py 30.43% <0.00%> (-52.18%) ⬇️
keylime/measured_boot.py 42.37% <0.00%> (-23.73%) ⬇️
keylime/ima/file_signatures.py 56.61% <0.00%> (-16.92%) ⬇️
keylime/common/algorithms.py 81.81% <0.00%> (-12.73%) ⬇️
keylime/cloud_verifier_tornado.py 58.76% <0.00%> (-8.42%) ⬇️
keylime/tornado_requests.py 57.50% <0.00%> (-7.50%) ⬇️
keylime/tpm/tpm_abstract.py 74.78% <0.00%> (-6.84%) ⬇️
keylime/elchecking/policies.py 64.00% <0.00%> (-4.00%) ⬇️
... and 9 more

@THS-on
Copy link
Member
8000 THS-on commented Oct 24, 2022

We changed it back because it broke encrypt(..) in user_data_encrypt.py, but the correct way is probably just to fix the issue there instead of only allowing utf-8 encoded files.

@maugustosilva maugustosilva self-requested a review October 24, 2022 14:48
@maugustosilva maugustosilva merged commit 5a09d75 into keylime:master Oct 25, 2022
@github-actions
Copy link

🎉 This PR is included in version 6.5.2 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@THS-on
Copy link
Member
THS-on commented Oct 25, 2022

@maugustosilva why is this merged? It currently breaks a lot of the e2e CI.

@sergio-correia
Copy link
Contributor

It's also interesting to note that the bot tagged a 6.5.2 release.

@maugustosilva
Copy link
Contributor

@THS-on Ah, I did not realize it was breaking the e2e CI! My mistake then.

It passed our internal e2e CI, it had two approvals (mine and Mike Peters) and that is why I have merged it.

I will revert momentarily.

maugustosilva added a commit that referenced this pull request Oct 25, 2022
@maugustosilva
Revert "Revert "tenant: open file to send utf-8 encoded" (#1136)"
f563888 
This reverts commit 5a09d75.
@maugustosilva maugustosilva mentioned this pull request Oct 25, 2022
Merged
@ansasaki
Copy link
Contributor Author

@maugustosilva why is this merged? It currently breaks a lot of the e2e CI.

Sorry, I hadn't finished the PR yet as the tests were failing, but forgot to mark as Draft. I'll fix this completely and then open a PR.

@maugustosilva
Copy link
Contributor

No worries, my mistake. Will revert and let you come back when it is fully fixed.

@aplanas
Copy link
Contributor
aplanas commented Oct 25, 2022

maybe we can release 6.5.3 with this revert?

@THS-on
Copy link
Member
THS-on commented Oct 25, 2022

@maugustosilva please also increase the version number of Keylime before before releasing 6.5.3 otherwise the upload to pypi will fail.

maugustosilva added a commit that referenced this pull request Oct 25, 2022
@maugustosilva
Revert "Revert "tenant: open file to send utf-8 encoded" (#1136)" (#1141
9515225 
)

This reverts commit 5a09d75.
@maugustosilva
Copy link
Contributor

Oops, too late just saw it now... Will increase the version on a separate PR then.

@github-actions
Copy link

🎉 This PR is included in version 6.5.2 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

mdrocco pushed a commit to mdrocco/keylime that referenced this pull request Oct 26, 2022
@ansasaki @mdrocco
Revert "tenant: open file to send utf-8 encoded" (keylime#1136)
cfae9e9 
* Revert "tenant: open file to send utf-8 encoded"

This reverts commit a865889.

By restricting files to be sent to be utf-8 encoded, this commit made
impossible to send zipped payloads using the tenant '-f' sub-option of
the 'add' command.

Signed-off-by: Anderson Toshiyuki Sasaki <ansasaki@redhat.com>
Signed-off-by: Maurizio Drocco <maurizio.drocco@ibm.com>
mdrocco pushed a commit to mdrocco/keylime that referenced this pull request Oct 26, 2022
@maugustosilva @mdrocco
Revert "Revert "tenant: open file to send utf-8 encoded" (keylime#1136)…
330f806 
…" (keylime#1141)

This reverts commit 5a09d75.

Signed-off-by: Maurizio Drocco <maurizio.drocco@ibm.com>
ansasaki added a commit to ansasaki/keylime that referenced this pull request Oct 27, 2022
@ansasaki
Revert "Revert "Revert "tenant: open file to send utf-8 encoded" (key…
90c4139 
…lime#1136)" (keylime#1141)"

This reverts commit 9515225.

Signed-off-by: Anderson Toshiyuki Sasaki <ansasaki@redhat.com>
THS-on pushed a commit that referenced this pull request Oct 31, 2022
@ansasaki @THS-on
Revert "Revert "Revert "tenant: open file to send utf-8 encoded" (#1136…
6704ee2 
…)" (#1141)"

This reverts commit 9515225.

Signed-off-by: Anderson Toshiyuki Sasaki <ansasaki@redhat.com>
mdrocco pushed a commit to mdrocco/keylime that referenced this pull request Nov 1, 2022
@ansasaki @mdrocco
Revert "tenant: open file to send utf-8 encoded" (keylime#1136)
84a3edf 
* Revert "tenant: open file to send utf-8 encoded"

This reverts commit a865889.

By restricting files to be sent to be utf-8 encoded, this commit made
impossible to send zipped payloads using the tenant '-f' sub-option of
the 'add' command.

Signed-off-by: Anderson Toshiyuki Sasaki <ansasaki@redhat.com>
Signed-off-by: Maurizio Drocco <maurizio.drocco@ibm.com>
mdrocco pushed a commit to mdrocco/keylime that referenced this pull request Nov 1, 2022
@maugustosilva @mdrocco
Revert "Revert "tenant: open file to send utf-8 encoded" (keylime#1136)…
c0005a6 
…" (keylime#1141)

This reverts commit 5a09d75.

Signed-off-by: Maurizio Drocco <maurizio.drocco@ibm.com>
mdrocco pushed a commit to mdrocco/keylime that referenced this pull request Nov 1, 2022
@ansasaki @mdrocco
Revert "tenant: open file to send utf-8 encoded" (keylime#1136)
663754a 
* Revert "tenant: open file to send utf-8 encoded"

This reverts commit a865889.

By restricting files to be sent to be utf-8 encoded, this commit made
impossible to send zipped payloads using the tenant '-f' sub-option of
the 'add' command.

Signed-off-by: Anderson Toshiyuki Sasaki <ansasaki@redhat.com>
Signed-off-by: Maurizio Drocco <maurizio.drocco@ibm.com>
mdrocco pushed a commit to mdrocco/keylime that referenced this pull request Nov 1, 2022
@maugustosilva @mdrocco
Revert "Revert "tenant: open file to send utf-8 encoded" (keylime#1136)…
57c2f6a 
…" (keylime#1141)

This reverts commit 5a09d75.

Signed-off-by: Maurizio Drocco <maurizio.drocco@ibm.com>
mdrocco pushed a commit to mdrocco/keylime that referenced this pull request Nov 1, 2022
@ansasaki @mdrocco
Revert "Revert "Revert "tenant: open file to send utf-8 encoded" (key…
bf2976e 
…lime#1136)" (keylime#1141)"

This reverts commit 9515225.

Signed-off-by: Anderson Toshiyuki Sasaki <ansasaki@redhat.com>
Signed-off-by: Maurizio Drocco <maurizio.drocco@ibm.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mpeters mpeters mpeters approved these changes

@maugustosilva maugustosilva maugustosilva approved these changes

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

Successfully merging this pull request may close these issues.
7 participants
@ansasaki @codecov-commenter @THS-on @sergio-correia @maugustosilva @aplanas @mpeters
0