Adam Vartanian
eb4598afba
Adjust Uri host parsing to use last instead of first @. am: cd6228dd37 am: 6a9c7c4814 am: 4158c9fbf3 am: eee677386e am: 49e5fca362 am: 240b55de2c am: 3ac5dabc21 am: f61daaa333
...
am: 49dfdd66cc
2017-11-07 23:04:25 +00:00
Adam Vartanian
49dfdd66cc
Adjust Uri host parsing to use last instead of first @. am: cd6228dd37 am: 6a9c7c4814 am: 4158c9fbf3 am: eee677386e am: 49e5fca362 am: 240b55de2c am: 3ac5dabc21
...
am: f61daaa333
2017-11-07 22:41:48 +00:00
Adam Vartanian
f61daaa333
Adjust Uri host parsing to use last instead of first @. am: cd6228dd37 am: 6a9c7c4814 am: 4158c9fbf3 am: eee677386e am: 49e5fca362 am: 240b55de2c
...
am: 3ac5dabc21
2017-11-07 22:12:09 +00:00
Adam Vartanian
3ac5dabc21
Adjust Uri host parsing to use last instead of first @. am: cd6228dd37 am: 6a9c7c4814 am: 4158c9fbf3 am: eee677386e am: 49e5fca362
...
am: 240b55de2c
2017-11-07 21:56:10 +00:00
Adam Vartanian
240b55de2c
Adjust Uri host parsing to use last instead of first @. am: cd6228dd37 am: 6a9c7c4814 am: 4158c9fbf3 am: eee677386e
...
am: 49e5fca362
2017-11-07 21:41:55 +00:00
Adam Vartanian
49e5fca362
Adjust Uri host parsing to use last instead of first @. am: cd6228dd37 am: 6a9c7c4814 am: 4158c9fbf3
...
am: eee677386e
2017-11-07 21:29:27 +00:00
Adam Vartanian
eee677386e
Adjust Uri host parsing to use last instead of first @. am: cd6228dd37 am: 6a9c7c4814
...
am: 4158c9fbf3
2017-11-07 21:02:07 +00:00
Adam Vartanian
4158c9fbf3
Adjust Uri host parsing to use last instead of first @. am: cd6228dd37
...
am: 6a9c7c4814
2017-11-07 20:51:02 +00:00
Adam Vartanian
6a9c7c4814
Adjust Uri host parsing to use last instead of first @.
...
am: cd6228dd37
2017-11-07 20:41:28 +00:00
Adam Vartanian
cd6228dd37
Adjust Uri host parsing to use last instead of first @.
...
Malformed authority segments can currently cause the parser to produce
a hostname that doesn't match the hostname produced by the WHATWG URL
parsing algorithm* used by browsers, which means that a URL could be seen
as having a "safe" host when checked by an Android app but actually visit
a different host when passed to a browser. The WHATWG URL parsing
algorithm always produces a hostname based on the last @ in the authority
segment, so we do the same.
* https://url.spec.whatwg.org/#authority-state resets the "buffer", which
is being used to build up the host name, each time an @ is found, so it
has the effect of using the content between the final @ and the end
of the authority section as the hostname.
Bug: 68341964
Test: vogar android.net.UriTest (on NYC branch)
Test: cts -m CtsNetTestCases (on NYC branch)
Change-Id: Idca79f35a886de042c94d6ab66787c2e98ac8376
2017-11-07 15:51:53 +00:00
Michael Plass
02d802e71e
DO NOT MERGE ANYWHERE: [AsyncChannel] Fix race in handling of sync result
...
Bug: 62866191
Bug: 63074860
Bug: 65267749
Test: wifi unit tests
Change-Id: I1d59eb8d599de9d9041e0b9b7d731363675a40c9
(cherry picked from commit 56e46134d39c1d56576e
2017-09-01 09:42:27 -07:00
TreeHugger Robot
039b357a46
Merge "Fix security hole in GateKeeperResponse." into mnc-dev
2017-08-15 19:30:53 +00:00
Charles He
159cd14334
[automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0 am: 1cd9e8096f am: 6dfc8d8d4d am: a3c1de7e49 am: 4acf4fabf4 am: 40317127f4
...
Change-Id: I6bb7e6146e9a5a1a7c4721c496b1088fb3209f00
2017-08-15 17:54:35 +00:00
Charles He
40317127f4
[automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0 am: 1cd9e8096f am: 6dfc8d8d4d am: a3c1de7e49 am: 4acf4fabf4
...
Change-Id: Iea8871d4f1a491e4571e2152afbf8855bf451478
2017-08-15 17:54:05 +00:00
Charles He
4acf4fabf4
[automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0 am: 1cd9e8096f am: 6dfc8d8d4d am: a3c1de7e49
...
Change-Id: Idcc4beaf75e1aba8609aa18ad1850e0796a17741
2017-08-15 17:53:35 +00:00
Charles He
a3c1de7e49
[automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0 am: 1cd9e8096f am: 6dfc8d8d4d
...
Change-Id: Ia5ad4b5d36d92caa26fa69951180320848c372e7
2017-08-15 17:52:57 +00:00
Charles He
6dfc8d8d4d
[automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0 am: 1cd9e8096f
...
Change-Id: I2fce56d688cc0a4111668c695c9cf9b1c930faf8
2017-08-15 17:52:27 +00:00
Charles He
1cd9e8096f
[automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0
...
Change-Id: Ia0d267bb2013d7ddfe26dddfa35f3f396cca7f20
2017-08-15 17:51:58 +00:00
Charles He
b1141b6ff0
[automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c
...
Change-Id: Ic72c354aaec594f02567949e294be2c10da47853
2017-08-15 17:51:28 +00:00
Stanley Tng
f6b59c80da
DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (2/3)
...
There are intermittent issues where either the returned Bluetooth
MAC address to Java framework is uninitialized or this address update
arrives too late. This fix will do 2 things:
(1) Returns error when MAC address is unavailable in the native code.
(2) Updates the MAC address later by adding a new broadcast event.
Test: Check address for these cases: factory reset, system reboot, and
Bluetooth re-enable.
Bug: 36709382
Merged-In: I09720193e38fdf9139e1bb146f8e1847e2b65b1a
(cherry picked from commit ad4d1d8e28
2017-07-31 21:14:50 +00:00
Phil Weaver
a84f7a3028
Merge "Back-port fixes for b/62196835" into nyc-mr1-dev
...
am: 4a1dc3458d
2017-07-19 00:53:13 +00:00
Phil Weaver
996bc6bc12
Merge "Back-port fixes for b/62196835" into mnc-dev am: 093c7a8e56 am: 0ddd7e4714
...
am: 9625d164e4
2017-07-18 23:41:26 +00:00
Phil Weaver
9625d164e4
Merge "Back-port fixes for b/62196835" into mnc-dev am: 093c7a8e56
...
am: 0ddd7e4714
2017-07-18 23:35:25 +00:00
Phil Weaver
0ddd7e4714
Merge "Back-port fixes for b/62196835" into mnc-dev
...
am: 093c7a8e56
2017-07-18 23:28:55 +00:00
Phil Weaver
41ff5389da
Back-port fixes for b/62196835
...
Bug: 62196835
Test: Created an accessibility service that displays a system
and a toast overlay, confirmed that it disappeared when we
reached the accessibility permission screen that uses this
flag.
Change-Id: Ic51ead670fc480e549512ba1d02f49d9c13bc3f0
2017-07-18 15:27:23 -07:00
Phil Weaver
4fa8b51c0c
Merge "Back-port fixes for b/62196835" into nyc-dev
...
am: 0b0834fbe8
2017-07-18 21:44:32 +00:00
Phil Weaver
7a237059c6
Back-port fixes for b/62196835
...
Bug: 62196835
Test: Created an accessibility service that displays a system
and a toast overlay, confirmed that it disappeared when we
reached the accessibility permission screen that uses this
flag.
Change-Id: Ic51ead670fc480e549512ba1d02f49d9c13bc3f0
2017-07-18 10:09:42 -07:00
Phil Weaver
d4a5fd1ce3
Back-port fixes for b/62196835
...
Bug: 62196835
Test: Created an accessibility service that displays a system
and a toast overlay, confirmed that it disappeared when we
reached the accessibility permission screen that uses this
flag.
Change-Id: Ic51ead670fc480e549512ba1d02f49d9c13bc3f0
2017-07-17 16:36:34 -07:00
Charles He
e74cae8f7c
Fix security hole in GateKeeperResponse.
...
GateKeeperResponse has inconsistent writeToParcel() and
createFromParcel() methods, making it possible for a malicious app to
create a Bundle that changes contents after reserialization. Such
Bundles can be used to execute Intents with system privileges.
This CL changes writeToParcel() to make serialization and
deserialization consistent, thus fixing the issue.
Bug: 62998805
Test: use the debug app (see bug)
Change-Id: Ie1c64172c454c3a4b7a0919eb3454f0e38efcd09
2017-07-14 14:36:11 +00:00
Phil Weaver
fd0ca151a6
Back-port fixes for b/62196835
...
Bug: 62196835
Test: Created an accessibility service that displays a system
and a toast overlay, confirmed that it disappeared when we
reached the accessibility permission screen that uses this
flag.
Change-Id: Ic51ead670fc480e549512ba1d02f49d9c13bc3f0
2017-07-12 16:57:31 -07:00
Phil Weaver
24fdc53cfe
DO NOT MERGE Back-port fixes for b/62196835
...
Bug: 62196835
Test: Created an accessibility service that displays a system
and a toast overlay, confirmed that it disappeared when we
reached the accessibility permission screen that uses this
flag.
Change-Id: Ic51ead670fc480e549512ba1d02f49d9c13bc3f0
2017-07-12 23:25:00 +00:00
Nick Kralevich
3c529012d3
ZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c am: 1cc9ec47c8 am: 8965cd6a39 am: 47beaa8fab am: 55c8a1ede9 am: 66a08a5413 am: 7a06357519 am: a07389b446 am: 5f4382e2a6
...
am: 3946a75cb3
2017-05-23 00:25:35 +00:00
Nick Kralevich
6cadbad153
system_server: add CAP_SYS_PTRACE am: 966619d0ab am: b8d972e973 am: c46889e2d2 am: f5bd84b82d am: 982b8018af am: 7fd2d8ea31 am: 5bfe82c3ee am: 12c5f0da9f am: dc87ac995a
...
am: 02f0044d98
2017-05-23 00:24:33 +00:00
Nick Kralevich
3946a75cb3
ZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c am: 1cc9ec47c8 am: 8965cd6a39 am: 47beaa8fab am: 55c8a1ede9 am: 66a08a5413 am: 7a06357519 am: a07389b446
...
am: 5f4382e2a6
2017-05-23 00:18:31 +00:00
Nick Kralevich
02f0044d98
system_server: add CAP_SYS_PTRACE am: 966619d0ab am: b8d972e973 am: c46889e2d2 am: f5bd84b82d am: 982b8018af am: 7fd2d8ea31 am: 5bfe82c3ee am: 12c5f0da9f
...
am: dc87ac995a
2017-05-23 00:17:22 +00:00
Nick Kralevich
5f4382e2a6
ZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c am: 1cc9ec47c8 am: 8965cd6a39 am: 47beaa8fab am: 55c8a1ede9 am: 66a08a5413 am: 7a06357519
...
am: a07389b446
2017-05-23 00:07:43 +00:00
Nick Kralevich
dc87ac995a
system_server: add CAP_SYS_PTRACE am: 966619d0ab am: b8d972e973 am: c46889e2d2 am: f5bd84b82d am: 982b8018af am: 7fd2d8ea31 am: 5bfe82c3ee
...
am: 12c5f0da9f
2017-05-23 00:06:55 +00:00
Nick Kralevich
a07389b446
ZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c am: 1cc9ec47c8 am: 8965cd6a39 am: 47beaa8fab am: 55c8a1ede9 am: 66a08a5413
...
am: 7a06357519
2017-05-22 23:51:48 +00:00
Nick Kralevich
12c5f0da9f
system_server: add CAP_SYS_PTRACE am: 966619d0ab am: b8d972e973 am: c46889e2d2 am: f5bd84b82d am: 982b8018af am: 7fd2d8ea31
...
am: 5bfe82c3ee
2017-05-22 23:50:57 +00:00
Nick Kralevich
7a06357519
ZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c am: 1cc9ec47c8 am: 8965cd6a39 am: 47beaa8fab am: 55c8a1ede9
...
am: 66a08a5413
2017-05-22 23:36:12 +00:00
Nick Kralevich
5bfe82c3ee
system_server: add CAP_SYS_PTRACE am: 966619d0ab am: b8d972e973 am: c46889e2d2 am: f5bd84b82d am: 982b8018af
...
am: 7fd2d8ea31
2017-05-22 23:35:04 +00:00
Nick Kralevich
66a08a5413
ZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c am: 1cc9ec47c8 am: 8965cd6a39 am: 47beaa8fab
...
am: 55c8a1ede9
2017-05-22 23:19:09 +00:00
Nick Kralevich
7fd2d8ea31
system_server: add CAP_SYS_PTRACE am: 966619d0ab am: b8d972e973 am: c46889e2d2 am: f5bd84b82d
...
am: 982b8018af
2017-05-22 23:18:24 +00:00
Nick Kralevich
55c8a1ede9
ZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c am: 1cc9ec47c8 am: 8965cd6a39
...
am: 47beaa8fab
2017-05-22 23:02:54 +00:00
Nick Kralevich
982b8018af
system_server: add CAP_SYS_PTRACE am: 966619d0ab am: b8d972e973 am: c46889e2d2
...
am: f5bd84b82d
2017-05-22 23:02:13 +00:00
Nick Kralevich
47beaa8fab
ZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c am: 1cc9ec47c8
...
am: 8965cd6a39
2017-05-22 22:46:18 +00:00
Nick Kralevich
f5bd84b82d
system_server: add CAP_SYS_PTRACE am: 966619d0ab am: b8d972e973
...
am: c46889e2d2
2017-05-22 22:45:44 +00:00
Nick Kralevich
8965cd6a39
ZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c
...
am: 1cc9ec47c8
2017-05-22 22:24:39 +00:00
Nick Kralevich
c46889e2d2
system_server: add CAP_SYS_PTRACE am: 966619d0ab
...
am: b8d972e973
2017-05-22 22:23:47 +00:00
Nick Kralevich
1cc9ec47c8
ZygoteInit: Remove CAP_SYS_RESOURCE
...
am: 4911af2b8c
2017-05-22 22:05:18 +00:00
