8000 [DependencyInjection] force enabling the external XML entity loaders by xabbuh · Pull Request #18908 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[DependencyInjection] force enabling the external XML entity loaders #18908

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
May 30, 2016
Merged

[DependencyInjection] force enabling the external XML entity loaders #18908

merged 1 commit into from
May 30, 2016

Conversation

xabbuh
Copy link
Member
@xabbuh xabbuh commented May 29, 2016
Q A
Branch? 2.3
Bug fix? yes
New feature? no
BC breaks? no
Deprecations? no
Tests pass? yes
Fixed tickets #18876
License MIT
Doc PR

@xabbuh xabbuh mentioned this pull request May 29, 2016
Closed
@nicolas-grekas
Copy link
Member

Do we have the same issue in XliffFileLoader.php and XmlUtils.php?

@nicolas-grekas
Copy link
Member

Thank you @xabbuh.

@nicolas-grekas nicolas-grekas merged commit 142b1a4 into symfony:2.3 May 30, 2016
nicolas-grekas added a commit that referenced this pull request May 30, 2016
@nicolas-grekas
bug #18908 [DependencyInjection] force enabling the external XML enti…
44f6f89 
…ty loaders (xabbuh)

This PR was merged into the 2.3 branch.

Discussion
----------

[DependencyInjection] force enabling the external XML entity loaders

| Q             | A
| ------------- | ---
| Branch?       | 2.3
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #18876
| License       | MIT
| Doc PR        |

Commits
-------

142b1a4 force enabling the external XML entity loaders
@sstok
Copy link
Contributor
sstok commented May 30, 2016

@nicolas-grekas It seems so, https://github.com/symfony/symfony/blob/master/src/Symfony/Component/Translation/Loader/schema/dic/xliff-core/xliff-core-1.2-strict.xsd#L33

I wonder if this will not load the external resources of the to be validated XML document, which would break the security system that was introduced 😨 can this be checked somehow?

@xabbuh xabbuh deleted the issue-18876 branch May 30, 2016 08:27
nicolas-grekas added a commit that referenced this pull request May 30, 2016
@nicolas-grekas
Revert "bug #18908 [DependencyInjection] force enabling the external …
91635a8 
…XML entity loaders (xabbuh)"

This reverts commit 44f6f89, reversing
changes made to 57d6053.
@nicolas-grekas
Copy link
Member

Reverted because this look suspicious and need more thought.
@xabbuh now that 2.3 is EOLed, could you please reopen this on 2.7 so that the discussion can continue?

@xabbuh
Copy link
Member Author
xabbuh commented May 30, 2016

@sstok @nicolas-grekas see #18915

8000

@xabbuh xabbuh mentioned this pull request May 30, 2016
Merged
@fabpot fabpot mentioned this pull request May 30, 2016
Merged
fabpot added a commit that referenced this pull request Jun 6, 2016
@fabpot
Merge branch '2.3' into 2.7
011d2dc 
* 2.3:
  updated VERSION for 2.3.42
  update CONTRIBUTORS for 2.3.42
  updated CHANGELOG for 2.3.42
  Revert "bug #18908 [DependencyInjection] force enabling the external XML entity loaders (xabbuh)"
  Partial revert of previous PR
  [DependencyInjection] Skip deep reference check for 'service_container'
  Catch \Throwable
  [Serializer] Add missing @throws annotations
  Fix for #18843
  force enabling the external XML entity loaders
  Removed UTC specification with timestamp
nicolas-grekas added a commit that referenced this pull request Jun 6, 2016
@nicolas-grekas
Merge branch '2.7' into 2.8
c4716d2 
* 2.7:
  `@throws` annotations should go after `@return`
  Fix merge
  updated VERSION for 2.3.42
  update CONTRIBUTORS for 2.3.42
  updated CHANGELOG for 2.3.42
  Revert "bug #18908 [DependencyInjection] force enabling the external XML entity loaders (xabbuh)"
  Partial revert of previous PR
  [DependencyInjection] Skip deep reference check for 'service_container'
  Catch \Throwable
  [Serializer] Add missing @throws annotations
  Fix for #18843
  force enabling the external XML entity loaders
  Removed UTC specification with timestamp

Conflicts:
	src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
	src/Symfony/Component/Finder/Finder.php
	src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php
	src/Symfony/Component/Security/Acl/Domain/ObjectIdentity.php
	src/Symfony/Component/Security/Acl/Model/AclInterface.php
	src/Symfony/Component/Security/Acl/Model/MutableAclProviderInterface.php
	src/Symfony/Component/Security/Acl/Permission/MaskBuilder.php
	src/Symfony/Component/Translation/Loader/XliffFileLoader.php
	src/Symfony/Component/Yaml/Tests/InlineTest.php
nicolas-grekas added a commit that referenced this pull request Jun 6, 2016
@nicolas-grekas
Merge branch '2.8' into 3.0
0ed0e64 
* 2.8:
  `@throws` annotations should go after `@return`
  Fix merge
  updated VERSION for 2.3.42
  update CONTRIBUTORS for 2.3.42
  updated CHANGELOG for 2.3.42
  Revert "bug #18908 [DependencyInjection] force enabling the external XML entity loaders (xabbuh)"
  Partial revert of previous PR
  [DependencyInjection] Skip deep reference check for 'service_container'
  Catch \Throwable
  [Serializer] Add missing @throws annotations
  Fix for #18843
  force enabling the external XML entity loaders
  Removed UTC specification with timestamp

Conflicts:
	CHANGELOG-2.3.md
	src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php
	src/Symfony/Bundle/TwigBundle/Extension/AssetsExtension.php
	src/Symfony/Component/Config/Loader/FileLoader.php
	src/Symfony/Component/DependencyInjection/Container.php
	src/Symfony/Component/DependencyInjection/ContainerBuilder.php
	src/Symfony/Component/Finder/Expression/Expression.php
	src/Symfony/Component/Finder/Finder.php
	src/Symfony/Component/HttpKernel/DependencyInjection/ContainerAwareHttpKernel.php
	src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
nicolas-grekas added a commit that referenced this pull request Jun 6, 2016
@nicolas-grekas
Merge branch '3.0' into 3.1
a249f5d 
* 3.0:
  `@throws` annotations should go after `@return`
  Fix merge
  updated VERSION for 2.3.42
  update CONTRIBUTORS for 2.3.42
  updated CHANGELOG for 2.3.42
  Revert "bug #18908 [DependencyInjection] force enabling the external XML entity loaders (xabbuh)"
  Partial revert of previous PR
  [DependencyInjection] Skip deep reference check for 'service_container'
  Catch \Throwable
  [Serializer] Add missing @throws annotations
  Fix for #18843
  force enabling the external XML entity loaders
  Removed UTC specification with timestamp

Conflicts:
	src/Symfony/Component/Yaml/Tests/InlineTest.php
nicolas-grekas added a commit that referenced this pull request Jun 6, 2016
@nicolas-grekas
Merge branch '3.1'
cd074b3 
* 3.1:
  `@throws` annotations should go after `@return`
  Fix merge
  updated VERSION for 2.3.42
  update CONTRIBUTORS for 2.3.42
  updated CHANGELOG for 2.3.42
  Revert "bug #18908 [DependencyInjection] force enabling the external XML entity loaders (xabbuh)"
  Partial revert of previous PR
  [DependencyInjection] Skip deep reference check for 'service_container'
  Catch \Throwable
  [Serializer] Add missing @throws annotations
  Fix for #18843
  force enabling the external XML entity loaders
  Removed UTC specification with timestamp
This was referenced Jun 6, 2016
Merged
Merged
Merged
fabpot added a commit that referenced this pull request Jun 13, 2016
@fabpot
bug #18915 [DependencyInjection] force enabling the external XML enti…
3f192dc 
…ty loaders (xabbuh)

This PR was merged into the 2.7 branch.

Discussion
----------

[DependencyInjection] force enabling the external XML entity loaders

| Q             | A
| ------------- | ---
| Branch?       | 2.7
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #18876, #18908
| License       | MIT
| Doc PR        |

Commits
-------

12b5509 force enabling the external XML entity loaders
@fabpot fabpot mentioned this pull request Jun 15, 2016
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Bug DependencyInjection Status: Needs Review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@xabbuh @nicolas-grekas @sstok @carsonbot
0