Explicitly check for port #23156

Merged
merged 1 commit into from Mar 14, 2016

Projects

None yet

4 participants

@DeepDiver1975
Member

The setup uses \OCP\IRequest::getInsecureServerHost which in some cases can also include a port. This makes the trusted domain check fail thus.

I've decided to add this here that way because adjusting the setup would require parsing the host properly. This is not something that can be done very good in PHP. Check the following example for why parse_url is not our friend: https://3v4l.org/k501Z

backport of #23125

@LukasReschke @DeepDiver1975 LukasReschke Explicitly check for port
The setup uses `\OCP\IRequest::getInsecureServerHost` which in some cases can also include a port. This makes the trusted domain check fail thus.

I've decided to add this here that way because adjusting the setup would require parsing the host properly. This is not something that can be done very good in PHP. Check the following example for why `parse_url` is not our friend: https://3v4l.org/k501Z
9bc99bb
@mention-bot

By analyzing the blame information on this pull request, we identified @LukasReschke and @MorrisJobke to be potential reviewers

@rullzer
Contributor
rullzer commented Mar 11, 2016

👍

@LukasReschke
Member

👍

@DeepDiver1975 DeepDiver1975 merged commit 5c38c1c into stable9 Mar 14, 2016

21 checks passed

cla-bot-core Build #2191 succeeded in 2 min 10 sec
Details
core-ci-linux-jsunit/database=sqlite,label=SLAVE Build #59311 succeeded in 2 min 3 sec
Details
core-ci-linux-swift-primary-storage/database=mysql,label=SLAVE Build #53255 succeeded in 1 hr 4 min
Details
core-ci-linux/database=mysql,label=SLAVE Build #27927 succeeded in 50 min
Details
core-ci-linux/database=oci,label=SLAVE Build #27927 succeeded in 1 hr 21 min
Details
core-ci-linux/database=pgsql,label=SLAVE Build #27927 succeeded in 24 min
Details
core-ci-linux/database=sqlite,label=SLAVE Build #27927 succeeded in 12 min
Details
ocs-api-integration-tests-ci Build #8334 succeeded in 10 min
Details
server-master-linux-externals-ci/database=sqlite,external=smb-silvershell,label=SLAVE Build #8158 succeeded in 7 min 3 sec
Details
server-master-linux-externals-ci/database=sqlite,external=swift-ceph,label=SLAVE Build #8158 succeeded in 10 min
Details
server-master-linux-externals-ci/database=sqlite,external=webdav-ownCloud,label=SLAVE Build #8158 succeeded in 15 min
Details
server-master-linux-externals-smb-windows-ext-ci/database=sqlite,external=smb-windows,label=master Build #8567 succeeded in 9 min 8 sec
Details
server-master-linux-php5.4-ci/database=sqlite,label=SLAVE Build #632 succeeded in 14 min
Details
server-master-linux-php7-ci/database=sqlite,label=SLAVE Build #36090 succeeded in 12 min
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=litmus,mirallBranch=v2.0.2,slave=SMASH Build #12551 succeeded in 5 min 52 sec
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_basicSync@0,mirallBranch=v2.0.2,slave=SMASH Build #12551 succeeded in 21 min
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_basicSync@1,mirallBranch=v2.0.2,slave=SMASH Build #12551 succeeded in 37 min
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_shareLink,mirallBranch=v2.0.2,slave=SMASH Build #12551 succeeded in 13 min
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_sharePermissions,mirallBranch=v2.0.2,slave=SMASH Build #12551 succeeded in 34 min
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_sharePropagationGroups,mirallBranch=v2.0.2,slave=SMASH Build #12551 succeeded in 18 min
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_sharePropagationInsideGroups,mirallBranch=v2.0.2,slave=SMASH Build #12551 succeeded in 16 min
Details
@DeepDiver1975 DeepDiver1975 deleted the add-port-support-to-trusteddomain-stable9 branch Mar 14, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment