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

Don't follow redirects besides in the connection validator #8253

Merged
merged 15 commits into from
Dec 9, 2020

Conversation

TheOneRing
Copy link
Member

@TheOneRing TheOneRing commented Nov 24, 2020

No description provided.

@TheOneRing TheOneRing changed the base branch from 2.7 to master November 25, 2020 09:23
@TheOneRing TheOneRing force-pushed the work/redirects branch 4 times, most recently from 12b3e75 to 94e8903 Compare December 1, 2020 12:00
@TheOneRing TheOneRing force-pushed the work/redirects branch 4 times, most recently from 10353fe to 7bfb3ab Compare December 8, 2020 10:39
@TheOneRing TheOneRing changed the title WIP: Don't follow redirects besides in the connection validator Don't follow redirects besides in the connection validator Dec 8, 2020
@TheOneRing TheOneRing marked this pull request as ready for review December 8, 2020 12:59
src/gui/accountstate.cpp Outdated Show resolved Hide resolved
src/gui/connectionvalidator.cpp Show resolved Hide resolved
.arg(Utility::escape(_ocWizard->account()->url().toString()));
} else {
errorMsg = job->errorStringParsingBody();
_ocWizard->show();
Copy link
Member

Choose a reason for hiding this comment

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

raiseDialog?

src/libsync/abstractnetworkjob.cpp Outdated Show resolved Hide resolved
src/libsync/creds/oauth.cpp Outdated Show resolved Hide resolved
@@ -349,26 +361,11 @@ private slots:
{
OC_ASSERT(browserReply);
// Kind of reproduces what we had in https://github.com/owncloud/enterprise/issues/2951 (not 1:1)
Copy link
Member

Choose a reason for hiding this comment

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

check again what's up here

@TheOneRing TheOneRing merged commit c998247 into master Dec 9, 2020
@delete-merged-branch delete-merged-branch bot deleted the work/redirects branch December 9, 2020 10:52
@sonarcloud
Copy link

sonarcloud bot commented Dec 9, 2020

Kudos, SonarCloud Quality Gate passed!

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 5 Code Smells

0.0% 0.0% Coverage
0.0% 0.0% Duplication

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.

2 participants