Hugo Benichi
9769872de6
Merge "IP connectivity metrics: NetworkEvents have transports" am: f8fdb06c27 am: f3ada43f6e
...
am: 1b2e6c11e7
2017-11-14 12:03:25 +00:00
Hugo Benichi
d80b572c1a
Merge "Add L2~L4 information to packet wakeup logs and metrics" am: 6ee20ca7d3 am: ab15f7fc64
...
am: 4c0b7e52e4
2017-11-14 11:55:45 +00:00
Hugo Benichi
1b2e6c11e7
Merge "IP connectivity metrics: NetworkEvents have transports" am: f8fdb06c27
...
am: f3ada43f6e
2017-11-14 01:46:23 +00:00
Hugo Benichi
4c0b7e52e4
Merge "Add L2~L4 information to packet wakeup logs and metrics" am: 6ee20ca7d3
...
am: ab15f7fc64
2017-11-14 01:40:06 +00:00
Hugo Benichi
652056767c
Merge "Add Network security watchlist service" am: e672ab4c0a
...
am: 1aff5336e0
2017-11-14 01:35:24 +00:00
Hugo Benichi
97bfd276fb
IP connectivity metrics: NetworkEvents have transports
...
Also removes netId field from inside NetworkEvent and stop populating
the network_id field of the NetworkEvent field, deprecating it.
Bug: 34901696
Test: runtest frameworks-net,
manually looking at $ adb shell dumpsys connmetrics
Change-Id: I2c36860f976898883714f72f4d18e06da250c6a6
2017-11-13 14:15:51 +09:00
Hugo Benichi
6ee20ca7d3
Merge "Add L2~L4 information to packet wakeup logs and metrics"
2017-11-13 03:58:34 +00:00
Ricky Wai
77518fbbc4
Add Network security watchlist service
...
Partial cherry pick from commit 1a6e667cb6
2017-11-12 22:27:35 +09:00
Hugo Benichi
d921bce5a6
Add L2~L4 information to packet wakeup logs and metrics
...
Example of $ adb shell dumpsys connmetrics list:
...
WakeupStats(wlan0, 21851s, total: 85, root: 0, system: 4, apps: 63, non-apps: 0, no uid: 18, l2 unicast/multicast/broadcast: 85/0/0, ethertype 0x800: 23, ethertype 0x86dd: 62, ipNxtHdr 6: 74, ipNxtHdr 17: 1, ipproto 58: 10)
...
WakeupEvent(06:55:54.094, wlan0, -1, eth=0x800, dstHw=10:e:7e:26:3f:c1, ipNxtHdr=6, srcIp=216.58.200.110, dstIp=100.112.108.29, srcPort=443, dstPort=46878)
WakeupEvent(06:57:14.379, wlan0, -1, eth=0x86dd, dstHw=10:e:7e:26:3f:c1, ipNxtHdr=58, srcIp=ff02::1, dstIp=fe80::fa00:4:fd00:1)
WakeupEvent(06:57:52.786, wlan0, 1000, eth=0x800, dstHw=10:e:7e:26:3f:c1, ipNxtHdr=6, srcIp=172.217.27.67, dstIp=100.112.108.29, srcPort=80, dstPort=49360)
WakeupEvent(06:58:02.919, wlan0, 10004, eth=0x86dd, dstHw=10:e:7e:26:3f:c1, ipNxtHdr=6, srcIp=2401:fa00:4:fd00:a585:13d1:6a23:4fb4, dstIp=2404:6800:4006:809::200a, srcPort=443, dstPort=46197)
WakeupEvent(06:58:05.586, wlan0, 10004, eth=0x86dd, dstHw=10:e:7e:26:3f:c1, ipNxtHdr=6, srcIp=2401:fa00:4:fd00:a585:13d1:6a23:4fb4, dstIp=2404:6800:4006:803::200a, srcPort=443, dstPort=46096)
Bug: 66869042
Test: runtest frameworks-net
+ manual testing by monitoring $ dumpsys connmetrics list
Change-Id: I03215c0c9fb7feda3e6ceb1b916f61f4ffb15344
2017-11-12 18:51:28 +09:00
Jon Dormody
df7f15e7d8
Merge "Docs: Added a link to Updating Your Security Provider to Protect Against SSL Exploits" into oc-dev am: 459735662f am: 13e959bbec am: d9696eb356
...
am: 5770dfd1e5
2017-11-09 16:58:09 +00:00
Jon Dormody
5770dfd1e5
Merge "Docs: Added a link to Updating Your Security Provider to Protect Against SSL Exploits" into oc-dev am: 459735662f am: 13e959bbec
...
am: d9696eb356
2017-11-09 16:42:19 +00:00
Jon Dormody
d9696eb356
Merge "Docs: Added a link to Updating Your Security Provider to Protect Against SSL Exploits" into oc-dev am: 459735662f
...
am: 13e959bbec
2017-11-09 16:26:50 +00:00
Jon Dormody
13e959bbec
Merge "Docs: Added a link to Updating Your Security Provider to Protect Against SSL Exploits" into oc-dev
...
am: 459735662f
2017-11-09 16:17:35 +00:00
Jon Dormody
459735662f
Merge "Docs: Added a link to Updating Your Security Provider to Protect Against SSL Exploits" into oc-dev
2017-11-09 16:05:13 +00:00
Ricky Wai
a3e562cd8f
Merge "Add Network security watchlist service"
2017-11-09 13:35:12 +00:00
Hugo Benichi
9c114081a8
Merge "MacAddress follow-up: define the core of the class" am: cd35c65b5b am: d39a50350a
...
am: f7c0f2e6bf
2017-11-09 12:55:56 +00:00
Hugo Benichi
f7c0f2e6bf
Merge "MacAddress follow-up: define the core of the class" am: cd35c65b5b
...
am: d39a50350a
2017-11-09 12:43:52 +00:00
Hugo Benichi
cd35c65b5b
Merge "MacAddress follow-up: define the core of the class"
2017-11-09 12:22:17 +00:00
Hugo Benichi
ac52e40049
MacAddress follow-up: define the core of the class
...
Test: new unit test parts of $ runtest frameworks-net
Change-Id: I08c57d2d656802f7bdd7a93fde711a7e77247583
2017-11-09 16:36:45 +09:00
Jonathan Dormody
f72e8263c7
Docs: Added a link to Updating Your Security Provider to Protect Against
...
SSL Exploits
Test: make ds-docs
Bug: 19110275
Change-Id: I3b0a35715c16c4e30a47aab9cbaf991770426c57
2017-11-08 17:13:58 -07:00
Ricky Wai
1a6e667cb6
Add Network security watchlist service
...
Network security watchlist service is a service to monitor all potential
harmful network traffic. By setting a network watchlist, any connections
that visit any site from watchlist will be logged.
Logs will be aggregated everyday and encoded using differential
privacy before exporting it from framework.
This feature is disabled now, run "setprop ro.network_watchlist_enabled true" to enable it.
All network events are handled in an async bg thread, it should not
cause any delay in netd. Also, it uses the hooks in enterprise network logging,
so we can run netd_benchmark to measure the impact to netd.
Here are the things not included in this CL:
- ConfigUpdater to get and set watchlist
- Differential privacy encoding logic and reporting
- CTS
- Memory and performance optimization for internal watchlist data structure
Test: manual - turn on the feature, hard code a watchlist xml, process
that visited that domain is being logged in sqlite.
Test: run netd_benchmark - seems no obvious performance change.
Test: bit FrameworksCoreTests:android.net.NetworkWatchlistManagerTests
Test: runtest frameworks-net
Test: runtest frameworks-services -p com.android.server.net.watchlist
Bug: 63908748
Change-Id: I09595178bac0070a867bc5e0501a7bf2c840e398
2017-11-08 18:57:46 +00:00
nharold
2b267dfbe9
Merge "Fix signature for finalize() to resolve API Lint error" am: c8ff280e73 am: c09d405e1d
...
am: f61308b9e4
2017-11-08 18:46:41 +00:00
Benedict Wong
cdd1d0ae7f
Merge "Update documentation for AES-GCM-ESP keymat length" am: 3db35dfcd5 am: 6491b03410
...
am: d840f4d667
2017-11-08 18:27:06 +00:00
nharold
f61308b9e4
Merge "Fix signature for finalize() to resolve API Lint error" am: c8ff280e73
...
am: c09d405e1d
2017-11-08 18:20:06 +00:00
Benedict Wong
d840f4d667
Merge "Update documentation for AES-GCM-ESP keymat length" am: 3db35dfcd5
...
am: 6491b03410
2017-11-08 18:12:25 +00:00
nharold
c8ff280e73
Merge "Fix signature for finalize() to resolve API Lint error"
2017-11-08 17:56:43 +00:00
Benedict Wong
3db35dfcd5
Merge "Update documentation for AES-GCM-ESP keymat length"
2017-11-08 17:47:40 +00:00
Tobias Thierer
5f3d5e91ee
Merge "Track deprecation/replacement of Os methods that depend on Mutable*" am: e8b07e5bef am: d20ae24fb1
...
am: fbaf4253ae
2017-11-08 17:09:37 +00:00
Tobias Thierer
fbaf4253ae
Merge "Track deprecation/replacement of Os methods that depend on Mutable*" am: e8b07e5bef
...
am: d20ae24fb1
2017-11-08 16:52:46 +00:00
Tobias Thierer
e8b07e5bef
Merge "Track deprecation/replacement of Os methods that depend on Mutable*"
2017-11-08 16:34:03 +00:00
Hugo Benichi
ffdbb572e5
Merge "Define MacAddress class" am: 925349ac8f am: 37caaaa705
...
am: 76c2cd2a6a
2017-11-08 06:57:00 +00:00
Hugo Benichi
76c2cd2a6a
Merge "Define MacAddress class" am: 925349ac8f
...
am: 37caaaa705
2017-11-08 06:46:49 +00:00
Hugo Benichi
e5b0f9f723
Merge "Networking metrics: minor pretty printing improvements" am: ee56b4a65c am: 5480314039
...
am: 2e2763f067
2017-11-08 03:56:40 +00:00
Hugo Benichi
2e2763f067
Merge "Networking metrics: minor pretty printing improvements" am: ee56b4a65c
...
am: 5480314039
2017-11-08 03:48:40 +00:00
Hugo Benichi
59c8e423a8
Define MacAddress class
...
Test: new unit tests part of $ runtest frameworks-net
Change-Id: I5a6a868ff86e9bffdc551d4e2bb486b585525c30
2017-11-08 11:09:49 +09:00
Nathan Harold
440824f743
Fix signature for finalize() to resolve API Lint error
...
The API linter on goog/master noticed that this method is
listed in the public API even though it's protected. The
change is probably related to a signature change from the
internal finalize method which throws a Throwable. Fix the
method in IpSecManager to throw Throwable, which should
fix the current.txt and resolve the lint error.
Bug: 69006767
Test: compilation, make update-api
Change-Id: I173d014baaa505c365b7916fcb52f2a8b4af9373
2017-11-07 17:46:12 -08:00
Benedict Wong
4ebc2c5968
Update documentation for AES-GCM-ESP keymat length
...
Added notes that keymat length must include 32 bits of salt.
Bug: 68672051
Test: Frameworks-net unit tests & IpSecManager CTS tests run
Change-Id: I0ae0c5be8a45b2374783b3bd1fa8bf930f15e687
2017-11-07 17:39:35 -08:00
Adam Vartanian
e0c97dfef8
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 am: eb4598afba am: a2149abe3a am: 560fb5d050 am: 2edd31e7fc am: 97ff9f9d27
...
am: 580feb2e37
2017-11-08 01:39:17 +00:00
Adam Vartanian
580feb2e37
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 am: eb4598afba am: a2149abe3a am: 560fb5d050 am: 2edd31e7fc
...
am: 97ff9f9d27
2017-11-08 01:13:26 +00:00
Hugo Benichi
c867f787bc
Networking metrics: minor pretty printing improvements
...
Bug: 65700460
Test: manually verified the output of $ adb shell dumpsys connmetrics
Change-Id: Ieae535b48d2e2b6e9087431d345c8f916006bb6c
2017-11-08 09:47:58 +09:00
Adam Vartanian
97ff9f9d27
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 am: eb4598afba am: a2149abe3a am: 560fb5d050
...
am: 2edd31e7fc
2017-11-08 00:38:27 +00:00
Adam Vartanian
2edd31e7fc
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 am: eb4598afba am: a2149abe3a
...
am: 560fb5d050
2017-11-08 00:15:23 +00:00
Adam Vartanian
560fb5d050
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 am: eb4598afba
...
am: a2149abe3a
2017-11-07 23:50:35 +00:00
Adam Vartanian
a2149abe3a
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
...
am: eb4598afba
2017-11-07 23:30:44 +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
