Skip to content

Conversation

@st3iny
Copy link
Member

@st3iny st3iny commented Sep 24, 2024

  • Resolves: none

Summary

The format -----BEGIN TRUSTED CERTIFICATE----- is non-standard and only used by OpenSSL. However, they can still be parsed by PHP through OpenSSL if the separator strings are simply replaced.

I also added a simple unit test with a sample certificate.

Checklist

@st3iny st3iny added bug 3. to review Waiting for reviews labels Sep 24, 2024
@st3iny st3iny self-assigned this Sep 24, 2024
@st3iny st3iny force-pushed the fix/gracefully-parse-trusted-certificates branch from 7c02934 to 5b67d74 Compare September 24, 2024 08:45
@st3iny st3iny force-pushed the fix/gracefully-parse-trusted-certificates branch from 5b67d74 to 19ad135 Compare September 24, 2024 10:36
Copy link
Contributor

@szaimen szaimen left a comment

Choose a reason for hiding this comment

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

LGTM and new unit test seem to pass 😎

@szaimen
Copy link
Contributor

szaimen commented Sep 24, 2024

/backport to stable30

@szaimen
Copy link
Contributor

szaimen commented Sep 24, 2024

/backport to stable29

@szaimen szaimen requested review from a team, Altahrim, nfebe and provokateurin and removed request for a team September 24, 2024 12:05
@st3iny st3iny added this to the Nextcloud 31 milestone Sep 24, 2024
@provokateurin provokateurin merged commit e247c26 into master Sep 24, 2024
@provokateurin provokateurin deleted the fix/gracefully-parse-trusted-certificates branch September 24, 2024 12:35
@provokateurin
Copy link
Member

/backport to stable28

@backportbot
Copy link

backportbot bot commented Sep 24, 2024

The backport to stable29 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable29
git pull origin stable29

# Create the new backport branch
git checkout -b backport/48307/stable29

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 19ad1357

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/48307/stable29

Error: No changes found in backport branch


Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

@backportbot
Copy link

backportbot bot commented Sep 24, 2024

The backport to stable28 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable28
git pull origin stable28

# Create the new backport branch
git checkout -b backport/48307/stable28

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 19ad1357

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/48307/stable28

Error: No changes found in backport branch


Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

@st3iny
Copy link
Member Author

st3iny commented Sep 24, 2024

/backport to stable28

@st3iny
Copy link
Member Author

st3iny commented Sep 24, 2024

/backport to stable29

@backportbot
Copy link

backportbot bot commented Sep 24, 2024

The backport to stable29 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable29
git pull origin stable29

# Create the new backport branch
git checkout -b backport/48307/stable29

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 19ad1357

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/48307/stable29

Error: No changes found in backport branch


Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

@backportbot
Copy link

backportbot bot commented Sep 24, 2024

The backport to stable28 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable28
git pull origin stable28

# Create the new backport branch
git checkout -b backport/48307/stable28

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 19ad1357

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/48307/stable28

Error: No changes found in backport branch


Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

Status: ☑️ Done

Development

Successfully merging this pull request may close these issues.

4 participants