Skip to content

Make check for empty trusted proxies more strict - #14606

Merged
MorrisJobke merged 2 commits into
masterfrom
bugfix/stricter-check-trusted-proxy
Mar 21, 2019
Merged

Make check for empty trusted proxies more strict#14606
MorrisJobke merged 2 commits into
masterfrom
bugfix/stricter-check-trusted-proxy

Conversation

@kesselb

@kesselbkesselb commented Mar 9, 2019

Copy link
Copy Markdown
Contributor

Follow-Up #14261

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
@MorrisJobke
MorrisJobkeforce-pushed the bugfix/stricter-check-trusted-proxy branch from 9e914bc to 3855d78CompareMarch 20, 2019 11:18
@MorrisJobke

Copy link
Copy Markdown
Member

Rebased to check if there are any CI failures.

@nextcloudnextcloud deleted a comment from faily-botBotMar 20, 2019
@MorrisJobke

Copy link
Copy Markdown
Member

@kesselb What is the status here?

@MorrisJobkeMorrisJobke added the 2. developing Work in progress label Mar 20, 2019
@kesselb

Copy link
Copy Markdown
ContributorAuthor

Looks good to me 🤣 $trustedProxies is always an array so this check would be more precise.

@kesselbkesselb added enhancement 3. to review Waiting for reviews and removed 2. developing Work in progress labels Mar 20, 2019
@kesselbkesselb added this to the Nextcloud 16 milestone Mar 20, 2019

@MorrisJobkeMorrisJobke left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Code makes sense 👍

Comment threadsettings/Controller/CheckSetupController.php Outdated
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
@faily-bot

faily-botBot commented Mar 20, 2019

Copy link
Copy Markdown

🤖 beep boop beep 🤖

Here are the logs for the failed build:

Status of 17189: failure

TESTS=acceptance, TESTS-ACCEPTANCE=apps

  • tests/acceptance/features/apps.feature:43
Show full log
 Scenario: Enable an app bundle # /drone/src/github.com/nextcloud/server/tests/acceptance/features/apps.feature:43
Given I act as Jane # ActorContext::iActAs()
And I am logged in as the admin # LoginPageContext::iAmLoggedInAsTheAdmin()
And I open the Apps management # SettingsMenuContext::iOpenTheAppsManagement()
And I open the "App bundles" section # AppNavigationContext::iOpenTheSection()
When I enable all apps from the "Enterprise bundle" # AppsManagementContext::iEnableAllAppsFromThe()
Then I see that the "Auditing / Logging" app has been enabled # AppsManagementContext::iSeeThatTheAppHasBeenEnabled()
Disable button in the app list for Auditing / Logging could not be found after 100 seconds (NoSuchElementException)
And I see that the "LDAP user and group backend" app has been enabled # AppsManagementContext::iSeeThatTheAppHasBeenEnabled()

@MorrisJobke

Copy link
Copy Markdown
Member
  • tests/acceptance/features/apps.feature:43

"Fixed" with #14774 (caused by #14578)

@MorrisJobke
MorrisJobke merged commit aee0b76 into masterMar 21, 2019
@MorrisJobke
MorrisJobke deleted the bugfix/stricter-check-trusted-proxy branch March 21, 2019 08:15
@MorrisJobkeMorrisJobke mentioned this pull request Mar 21, 2019
9 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to reviewWaiting for reviewsenhancement

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@kesselb@MorrisJobke@nickvergessen@ChristophWurst