Part 2.1: Is policy list subsumed under subsuming policy?

Part 2.1: Is policy list subsumed under subsuming policy?

This is part of an experimental feature Embedding-CSP.

In particular this is the second CL devoted to implementing
*3.3. Is policy list subsumed under subsuming policy?

In this patch we try to find normalized list of CSPSources
from the two given vectors of CSPSources.

Example:
A: http://*.example.com
B: http://example.com/index.html
In this case, the latter contains more information because
it provides a more specific path and no host wildcard. Thus,
their normalization would be equivalent to B.

Example:
A: http://
B: http://example.com/index.html
Scheme-source/ host-source expression normalization should
be equivalent to B.

Example:
A: https://
B: http://example.com/index.html
Scheme-source/ host-source expression normalization should
return https://example.com/index.html.

BUG=647588
Committed: https://crrev.com/14162d1652623759b9d3528bda3b22b4952d47b4
Cr-Commit-Position: refs/heads/master@{#430267}

[amalika, 2016-11-02 10:14:22]

Description was changed from

==========
This is part of an experimental feature Embedding-CSP.

In particular this is the second CL devoted to implementing
*3.3. Is policy list subsumed under subsuming policy?

In this patch we try to find normalized list of CSPSources
from the two given vectors of CSPSources.

BUG=647588
==========

to

==========
This is part of an experimental feature Embedding-CSP.

In particular this is the second CL devoted to implementing
*3.3. Is policy list subsumed under subsuming policy?

In this patch we try to find normalized list of CSPSources
from the two given vectors of CSPSources.

Example:
A: http://example.com
B: http://example.com/index.html

In this case, the latter contains more information because it provides a more
specific path. Thus, their normalization would be equivalent to B.

Example:
A: http://
B: http://example.com/index.html
Scheme-source/ host-source expression normalization should a source equivalent
to B.

Example:
A: https://
B: http://example.com/index.html
Scheme-source/ host-source expression normalization should return
https://example.com/index.html.

Example:
A: http://
B: https://example.com/index.html
Scheme-source/ host-source expression normalization should a source equivalent
to B.

More information here:
https://docs.google.com/document/d/1xwTxpB_sWYaTrOBJEPSXtfWKO4M2k9Xya7o0zcd6D...

BUG=647588
==========

[amalika, 2016-11-02 10:14:22]

amalika@google.com changed reviewers:
+ jochen@chromium.org, mkwst@chromium.org

[amalika, 2016-11-02 10:14:36]

The CQ bit was checked by amalika@google.com

[commit-bot: I haz the power, 2016-11-02 10:14:47]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-11-02 10:14:48]

This CL has an open dependency (Issue 2442513004 Patch 100001). Please resolve
the dependency and try again.
If you are sure that there is no real dependency, please use one of the options
listed in https://goo.gl/9Es4OR to land the CL.

[amalika, 2016-11-02 10:15:20]

Description was changed from

==========
This is part of an experimental feature Embedding-CSP.

In particular this is the second CL devoted to implementing
*3.3. Is policy list subsumed under subsuming policy?

In this patch we try to find normalized list of CSPSources
from the two given vectors of CSPSources.

Example:
A: http://example.com
B: http://example.com/index.html

In this case, the latter contains more information because it provides a more
specific path. Thus, their normalization would be equivalent to B.

Example:
A: http://
B: http://example.com/index.html
Scheme-source/ host-source expression normalization should a source equivalent
to B.

Example:
A: https://
B: http://example.com/index.html
Scheme-source/ host-source expression normalization should return
https://example.com/index.html.

Example:
A: http://
B: https://example.com/index.html
Scheme-source/ host-source expression normalization should a source equivalent
to B.

More information here:
https://docs.google.com/document/d/1xwTxpB_sWYaTrOBJEPSXtfWKO4M2k9Xya7o0zcd6D...

BUG=647588
==========

to

==========
This is part of an experimental feature Embedding-CSP.

In particular this is the second CL devoted to implementing
*3.3. Is policy list subsumed under subsuming policy?

In this patch we try to find normalized list of CSPSources
from the two given vectors of CSPSources.

Example:
A: http://example.com
B: http://example.com/index.html

In this case, the latter contains more information because it 
provides a more specific path. Thus, their normalization would 
be equivalent to B.

Example:
A: http://
B: http://example.com/index.html
Scheme-source/ host-source expression normalization should a 
source equivalent to B.

Example:
A: https://
B: http://example.com/index.html
Scheme-source/ host-source expression normalization should return
https://example.com/index.html.

More information here:
https://docs.google.com/document/d/1xwTxpB_sWYaTrOBJEPSXtfWKO4M2k9Xya7o0zcd6D...

BUG=647588
==========

[amalika, 2016-11-02 10:16:22]

Description was changed from

==========
This is part of an experimental feature Embedding-CSP.

In particular this is the second CL devoted to implementing
*3.3. Is policy list subsumed under subsuming policy?

In this patch we try to find normalized list of CSPSources
from the two given vectors of CSPSources.

Example:
A: http://example.com
B: http://example.com/index.html

In this case, the latter contains more information because it 
provides a more specific path. Thus, their normalization would 
be equivalent to B.

Example:
A: http://
B: http://example.com/index.html
Scheme-source/ host-source expression normalization should a 
source equivalent to B.

Example:
A: https://
B: http://example.com/index.html
Scheme-source/ host-source expression normalization should return
https://example.com/index.html.

More information here:
https://docs.google.com/document/d/1xwTxpB_sWYaTrOBJEPSXtfWKO4M2k9Xya7o0zcd6D...

BUG=647588
==========

to

==========
This is part of an experimental feature Embedding-CSP.

In particular this is the second CL devoted to implementing
*3.3. Is policy list subsumed under subsuming policy?

In this patch we try to find normalized list of CSPSources
from the two given vectors of CSPSources.

Example:
A: http://example.com
B: http://example.com/index.html

In this case, the latter contains more information because 
it provides a more specific path. Thus, their normalization 
would be equivalent to B.

Example:
A: http://
B: http://example.com/index.html
Scheme-source/ host-source expression normalization should
a source equivalent to B.

Example:
A: https://
B: http://example.com/index.html
Scheme-source/ host-source expression normalization should 
return https://example.com/index.html.

BUG=647588
==========

[amalika, 2016-11-02 10:17:12]

Description was changed from

==========
This is part of an experimental feature Embedding-CSP.

In particular this is the second CL devoted to implementing
*3.3. Is policy list subsumed under subsuming policy?

In this patch we try to find normalized list of CSPSources
from the two given vectors of CSPSources.

Example:
A: http://example.com
B: http://example.com/index.html

In this case, the latter contains more information because 
it provides a more specific path. Thus, their normalization 
would be equivalent to B.

Example:
A: http://
B: http://example.com/index.html
Scheme-source/ host-source expression normalization should
a source equivalent to B.

Example:
A: https://
B: http://example.com/index.html
Scheme-source/ host-source expression normalization should 
return https://example.com/index.html.

BUG=647588
==========

to

==========
This is part of an experimental feature Embedding-CSP.

In particular this is the second CL devoted to implementing
*3.3. Is policy list subsumed under subsuming policy?

In this patch we try to find normalized list of CSPSources
from the two given vectors of CSPSources.

Example:
A: http://*.example.com
B: http://example.com/index.html
In this case, the latter contains more information because 
it provides a more specific path and no host wildcard. Thus,
their normalization would be equivalent to B.

Example:
A: http://
B: http://example.com/index.html
Scheme-source/ host-source expression normalization should
a source equivalent to B.

Example:
A: https://
B: http://example.com/index.html
Scheme-source/ host-source expression normalization should 
return https://example.com/index.html.

BUG=647588
==========

[amalika, 2016-11-02 12:46:19]

Description was changed from

==========
This is part of an experimental feature Embedding-CSP.

In particular this is the second CL devoted to implementing
*3.3. Is policy list subsumed under subsuming policy?

In this patch we try to find normalized list of CSPSources
from the two given vectors of CSPSources.

Example:
A: http://*.example.com
B: http://example.com/index.html
In this case, the latter contains more information because 
it provides a more specific path and no host wildcard. Thus,
their normalization would be equivalent to B.

Example:
A: http://
B: http://example.com/index.html
Scheme-source/ host-source expression normalization should
a source equivalent to B.

Example:
A: https://
B: http://example.com/index.html
Scheme-source/ host-source expression normalization should 
return https://example.com/index.html.

BUG=647588
==========

to

==========
This is part of an experimental feature Embedding-CSP.

In particular this is the second CL devoted to implementing
*3.3. Is policy list subsumed under subsuming policy?

In this patch we try to find normalized list of CSPSources
from the two given vectors of CSPSources.

Example:
A: http://*.example.com
B: http://example.com/index.html
In this case, the latter contains more information because 
it provides a more specific path and no host wildcard. Thus,
their normalization would be equivalent to B.

Example:
A: http://
B: http://example.com/index.html
Scheme-source/ host-source expression normalization should
be equivalent to B.

Example:
A: https://
B: http://example.com/index.html
Scheme-source/ host-source expression normalization should 
return https://example.com/index.html.

BUG=647588
==========

[jochen (gone - plz use gerrit), 2016-11-04 09:29:57]

waiting for this CL to be rebased on top of 1.1

[amalika, 2016-11-04 10:37:34]

Patchset #2 (id:20001) has been deleted

[amalika, 2016-11-04 10:42:40]

Rebased!

https://codereview.chromium.org/2470083002/diff/40001/third_party/WebKit/Sour...
File third_party/WebKit/Source/core/frame/csp/CSPSource.cpp (right):

https://codereview.chromium.org/2470083002/diff/40001/third_party/WebKit/Sour...
third_party/WebKit/Source/core/frame/csp/CSPSource.cpp:148: String scheme =
other->schemeMatches(m_scheme) ? m_scheme : other->m_scheme;
It is easier to define `isSimilar` since every part (scheme, host, etc) might be
individually stricter in either CSPSource. But this results in re-evaluation of
schemeMatches and pathmatches. 

A more efficient approach would be just comparing everything here and saving
which CSPSource had stricter for each part (which one has more secure scheme, or
longer more defined path), but a bit less readable due to number of booleans.

[jochen (gone - plz use gerrit), 2016-11-04 13:14:51]

https://codereview.chromium.org/2470083002/diff/40001/third_party/WebKit/Sour...
File third_party/WebKit/Source/core/frame/csp/CSPSource.cpp (right):

https://codereview.chromium.org/2470083002/diff/40001/third_party/WebKit/Sour...
third_party/WebKit/Source/core/frame/csp/CSPSource.cpp:151: int port =
m_portWildcard == NoWildcard ? m_port : other->m_port;
could it happen that m_port is 0 but other->m_port is not?

https://codereview.chromium.org/2470083002/diff/40001/third_party/WebKit/Sour...
File third_party/WebKit/Source/core/frame/csp/CSPSource.h (right):

https://codereview.chromium.org/2470083002/diff/40001/third_party/WebKit/Sour...
third_party/WebKit/Source/core/frame/csp/CSPSource.h:41: CSPSource*
getNormalized(CSPSource*);
what about

static CSPSource* intersect(CSPSource*, CSPSource*) ?

[amalika, 2016-11-04 13:34:38]

On 2016/11/04 at 13:14:51, jochen wrote:
>
https://codereview.chromium.org/2470083002/diff/40001/third_party/WebKit/Sour...
> File third_party/WebKit/Source/core/frame/csp/CSPSource.cpp (right):
> 
>
https://codereview.chromium.org/2470083002/diff/40001/third_party/WebKit/Sour...
> third_party/WebKit/Source/core/frame/csp/CSPSource.cpp:151: int port =
m_portWildcard == NoWildcard ? m_port : other->m_port;
> could it happen that m_port is 0 but other->m_port is not?

I initially also checked for that, but thought it wouldn't make much difference
since if the ports match and one of them is 0, 
then it must be equal to the default port anyways?
But I guess it might indeed be better to have a non-zero port for faster checks
in portMatch() in further calls.
 
>
https://codereview.chromium.org/2470083002/diff/40001/third_party/WebKit/Sour...
> File third_party/WebKit/Source/core/frame/csp/CSPSource.h (right):
> 
>
https://codereview.chromium.org/2470083002/diff/40001/third_party/WebKit/Sour...
> third_party/WebKit/Source/core/frame/csp/CSPSource.h:41: CSPSource*
getNormalized(CSPSource*);
> what about
> 
> static CSPSource* intersect(CSPSource*, CSPSource*) ?

Updated!

[jochen (gone - plz use gerrit), 2016-11-04 15:04:29]

lgtm

[jochen (gone - plz use gerrit), 2016-11-04 15:05:21]

please remember to upgrade the CL description to mirror the CL title in the
first line

[amalika, 2016-11-04 18:50:35]

Description was changed from

==========
This is part of an experimental feature Embedding-CSP.

In particular this is the second CL devoted to implementing
*3.3. Is policy list subsumed under subsuming policy?

In this patch we try to find normalized list of CSPSources
from the two given vectors of CSPSources.

Example:
A: http://*.example.com
B: http://example.com/index.html
In this case, the latter contains more information because 
it provides a more specific path and no host wildcard. Thus,
their normalization would be equivalent to B.

Example:
A: http://
B: http://example.com/index.html
Scheme-source/ host-source expression normalization should
be equivalent to B.

Example:
A: https://
B: http://example.com/index.html
Scheme-source/ host-source expression normalization should 
return https://example.com/index.html.

BUG=647588
==========

to

==========
Part 2.1: Is policy list subsumed under subsuming policy?

This is part of an experimental feature Embedding-CSP.

In particular this is the second CL devoted to implementing
*3.3. Is policy list subsumed under subsuming policy?

In this patch we try to find normalized list of CSPSources
from the two given vectors of CSPSources.

Example:
A: http://*.example.com
B: http://example.com/index.html
In this case, the latter contains more information because 
it provides a more specific path and no host wildcard. Thus,
their normalization would be equivalent to B.

Example:
A: http://
B: http://example.com/index.html
Scheme-source/ host-source expression normalization should
be equivalent to B.

Example:
A: https://
B: http://example.com/index.html
Scheme-source/ host-source expression normalization should 
return https://example.com/index.html.

BUG=647588
==========

[Mike West, 2016-11-07 10:35:43]

LGTM2. Thanks for adding the extensive tests.

[amalika, 2016-11-07 10:39:11]

The CQ bit was checked by amalika@google.com

[commit-bot: I haz the power, 2016-11-07 10:39:19]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-11-07 10:41:50]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-11-07 10:41:51]

Try jobs failed on following builders:
  linux_chromium_chromeos_rel_ng on master.tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)
  mac_chromium_compile_dbg_ng on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_comp...)
  mac_chromium_rel_ng on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_rel_...)

[amalika, 2016-11-07 12:50:54]

The CQ bit was checked by amalika@google.com

[amalika, 2016-11-07 12:50:55]

The patchset sent to the CQ was uploaded after l-g-t-m from jochen@chromium.org
Link to the patchset: https://codereview.chromium.org/2470083002/#ps80001
(title: "Rebasing on master")

[commit-bot: I haz the power, 2016-11-07 12:51:07]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-11-07 14:14:38]

Committed patchset #4 (id:80001)

[commit-bot: I haz the power, 2016-11-07 14:19:20]

Description was changed from

==========
Part 2.1: Is policy list subsumed under subsuming policy?

This is part of an experimental feature Embedding-CSP.

In particular this is the second CL devoted to implementing
*3.3. Is policy list subsumed under subsuming policy?

In this patch we try to find normalized list of CSPSources
from the two given vectors of CSPSources.

Example:
A: http://*.example.com
B: http://example.com/index.html
In this case, the latter contains more information because 
it provides a more specific path and no host wildcard. Thus,
their normalization would be equivalent to B.

Example:
A: http://
B: http://example.com/index.html
Scheme-source/ host-source expression normalization should
be equivalent to B.

Example:
A: https://
B: http://example.com/index.html
Scheme-source/ host-source expression normalization should 
return https://example.com/index.html.

BUG=647588
==========

to

==========
Part 2.1: Is policy list subsumed under subsuming policy?

This is part of an experimental feature Embedding-CSP.

In particular this is the second CL devoted to implementing
*3.3. Is policy list subsumed under subsuming policy?

In this patch we try to find normalized list of CSPSources
from the two given vectors of CSPSources.

Example:
A: http://*.example.com
B: http://example.com/index.html
In this case, the latter contains more information because
it provides a more specific path and no host wildcard. Thus,
their normalization would be equivalent to B.

Example:
A: http://
B: http://example.com/index.html
Scheme-source/ host-source expression normalization should
be equivalent to B.

Example:
A: https://
B: http://example.com/index.html
Scheme-source/ host-source expression normalization should
return https://example.com/index.html.

BUG=647588

Committed: https://crrev.com/14162d1652623759b9d3528bda3b22b4952d47b4
Cr-Commit-Position: refs/heads/master@{#430267}
==========

[commit-bot: I haz the power, 2016-11-07 14:19:21]

Patchset 4 (id:??) landed as
https://crrev.com/14162d1652623759b9d3528bda3b22b4952d47b4
Cr-Commit-Position: refs/heads/master@{#430267}