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

Fixes #11443 - Adds check to AcceptanceController to see if signatures are enabled #11444

Closed
wants to merge 1 commit into from
Closed

Fixes #11443 - Adds check to AcceptanceController to see if signatures are enabled #11444

wants to merge 1 commit into from

Conversation

mikeroq
Copy link
Contributor

@mikeroq mikeroq commented Jul 1, 2022

Description

Fixes #11443. Just adds a check to the require_accept_signature setting and moves the signature processing into there.

Type of change

Please delete options that are not relevant.

  • [ x] Bug fix (non-breaking change which fixes an issue)

How Has This Been Tested?

Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration

  • Test A
  • Test B

Test Configuration:

  • PHP version: 8.1.5
  • MySQL version 8.0.29
  • Webserver version Apache 2.4.41
  • OS version Ubuntu 20.04.4

Checklist:

  • [x ] I have read the Contributing documentation available here: https://snipe-it.readme.io/docs/contributing-overview
  • [ x] I have formatted this PR according to the project guidelines: https://snipe-it.readme.io/docs/contributing-overview#pull-request-guidelines
  • [x ] My code follows the style guidelines of this project
  • [ x] I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • [x ] My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes

@snipe
Copy link
Owner

snipe commented Jul 1, 2022

This looks great - can you just back out that change to version.php?

@mikeroq
Copy link
Contributor Author

mikeroq commented Jul 1, 2022

Ok I think I got it. Excuse my noobiness!

@snipe
Copy link
Owner

snipe commented Jul 1, 2022

Now there is a merge conflict? What the hell? I haven't pushed anything up

@mikeroq
Copy link
Contributor Author

mikeroq commented Jul 1, 2022

Could have been me! I had to google about how to remove those commits :(

snipe added a commit that referenced this pull request Jul 1, 2022
Signed-off-by: snipe <[email protected]>
@snipe
Copy link
Owner

snipe commented Jul 1, 2022

I made a clean version here - can you take a look and make sure it does what you're looking for? #11445

snipe added a commit that referenced this pull request Jul 1, 2022
@snipe snipe closed this Jul 1, 2022
@snipe
Copy link
Owner

snipe commented Jul 1, 2022

Sorry this PR got wonky - you did the work and I'd have preferred you get the credit for it :(

@mikeroq mikeroq deleted the fixes/check_signatures_enabled_in_acceptancecontroller branch July 2, 2022 00:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants