filab/packages_apps_Messaging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,215 Commits 1 Branch 0 Tags
6daf7c7dab9bed93b955694f2993c3f4ef46830f
Commit Graph
39 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jake Klinker 6daf7c7dab Fix exposing private messages files through attachments with a content URI. am: 0d5452146c am: f5c73b1923 am: 6542270a1f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/23089831

Change-Id: I07b12cba891563e7bb935980afe3352cda7104af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 01:50:09 +00:00
Jake Klinker 6542270a1f Fix exposing private messages files through attachments with a content URI. am: 0d5452146c am: f5c73b1923 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/23089831

Change-Id: Ida74ec2de652b8e4fcb874a111852f655ba64cfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 01:14:07 +00:00
Jake Klinker f5c73b1923 Fix exposing private messages files through attachments with a content URI. am: 0d5452146c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/23089831

Change-Id: I56f3015298ed0b2acde72442b458e0b354f0e13d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 00:27:51 +00:00
Jake Klinker f1b8f9a226 Fix exposing private messages files through attachments with a content URI. 
Change-Id: I30b2a06c67af4a347d03c7504d13b9b9365acafd
Tested: Was no longer able to repro b/275552292.
Bug: 275552292
 2023-05-09 14:00:51 +00:00
Jake Klinker 0d5452146c Fix exposing private messages files through attachments with a content URI. 
Change-Id: I30b2a06c67af4a347d03c7504d13b9b9365acafd
Tested: Was no longer able to repro b/275552292.
Bug: 275552292
 2023-05-09 14:00:39 +00:00
Jake Klinker 6c466001b2 Fix url:file:// style URIs from not being detected in UriUtil. am: c8e4ab2b22 am: a707a5cd8d am: 53ced613ab am: 3153a43657 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/17957509

Change-Id: Ice55370cf005608a17cf02e75d367c0968df1940
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 03:22:17 +00:00
Jake Klinker ee96617536 Fix url:file:// style URIs from not being detected in UriUtil. am: c8e4ab2b22 am: 6d643719c4 am: 24594cbf9d am: 65d9cf0f23 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/17957509

Change-Id: Ibb90a3782bdc30f8601d5d6ba566f74ad992e301
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 02:48:59 +00:00
Jake Klinker 0c1b3f5c40 Fix url:file:// style URIs from not being detected in UriUtil. am: c8e4ab2b22 am: a707a5cd8d am: c51c783a46 am: 4d9ed48155 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/17957509

Change-Id: I27456044b21ce0ebde3ba4380c8f66117991fd30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 13:03:38 +00:00
Jake Klinker 3153a43657 Fix url:file:// style URIs from not being detected in UriUtil. am: c8e4ab2b22 am: a707a5cd8d am: 53ced613ab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/17957509

Change-Id: I449cf1dccdca62bc5451618a66ae43f59c5c7701
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 21:18:08 +00:00
Jake Klinker 65d9cf0f23 Fix url:file:// style URIs from not being detected in UriUtil. am: c8e4ab2b22 am: 6d643719c4 am: 24594cbf9d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/17957509

Change-Id: I7a16969994fcd4c17ddaf5ccee7c04b1ee8a5817
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 21:17:24 +00:00
Jake Klinker 4d9ed48155 Fix url:file:// style URIs from not being detected in UriUtil. am: c8e4ab2b22 am: a707a5cd8d am: c51c783a46 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/17957509

Change-Id: Ic94982da7a74f5b756feb2c9169cf5757e4b8bc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 21:16:59 +00:00
Jake Klinker c51c783a46 Fix url:file:// style URIs from not being detected in UriUtil. am: c8e4ab2b22 am: a707a5cd8d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/17957509

Change-Id: I10742143b1c7e1f81a4c8f7a25ca1f949889cf8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 20:36:07 +00:00
Jake Klinker 53ced613ab Fix url:file:// style URIs from not being detected in UriUtil. am: c8e4ab2b22 am: a707a5cd8d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/17957509

Change-Id: I0d6e4bff6d1b3c825a72006768d16697c385271b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 20:36:03 +00:00
Jake Klinker 24594cbf9d Fix url:file:// style URIs from not being detected in UriUtil. am: c8e4ab2b22 am: 6d643719c4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/17957509

Change-Id: I4aad45472c767c3e9a9869f76e60009a84431707
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 20:35:55 +00:00
Jake Klinker c5961c337d Fix url:file:// style URIs from not being detected in UriUtil. am: c8e4ab2b22 am: 682ab534f6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/17957509

Change-Id: I0a4645306d5ab011c7b5dd9e84b93de1e8443c7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 20:35:12 +00:00
Jake Klinker a707a5cd8d Fix url:file:// style URIs from not being detected in UriUtil. am: c8e4ab2b22 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/17957509

Change-Id: Ic40d53b31defa115d376069d7d873bac70c5d7c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 20:18:26 +00:00
Jake Klinker 682ab534f6 Fix url:file:// style URIs from not being detected in UriUtil. am: c8e4ab2b22 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/17957509

Change-Id: I963d72306df114e57364b3e3ed3519eab7ace1de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 20:17:19 +00:00
Jake Klinker 6d643719c4 Fix url:file:// style URIs from not being detected in UriUtil. am: c8e4ab2b22 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/17957509

Change-Id: Iace24a73bdf3f1ece511f4689198b1e28f4026c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 20:16:54 +00:00
Jake Klinker c8e4ab2b22 Fix url:file:// style URIs from not being detected in UriUtil. 
Change-Id: I81c01202306d856f6f8f8b74a5a28d7c1011fcec
Tested: Was no longer able to repro b/222091734.
Bug: 222091734
(cherry picked from commit 2283165c23)
 2022-04-26 16:38:11 +00:00
Jake Klinker 2283165c23 Fix url:file:// style URIs from not being detected in UriUtil. 
Change-Id: I81c01202306d856f6f8f8b74a5a28d7c1011fcec
Tested: Was no longer able to repro b/222091734.
Bug: 222091734
 2022-04-21 18:35:50 +00:00
Jake Klinker 7c427d52ee [automerge] Use UriUtil when checking if a URI is a file. 2p: 27e27d944b am: a3f2d65241 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/16764000

Change-Id: I832aa4951ae4058d3d5f41c9a696c42eefa86401
 2022-02-03 01:48:00 +00:00
Jake Klinker a3f2d65241 [automerge] Use UriUtil when checking if a URI is a file. 2p: 27e27d944b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/16764000

Bug: 215212561
Change-Id: I59e1aa0f1799fb1eb993bd4e1089b665d0965099
 2022-01-31 20:30:29 +00:00
Jake Klinker 27e27d944b Use UriUtil when checking if a URI is a file. 
UriUtil.isFileUri contains several additional fixes, so this ensure that existing instances where we check for the file scheme use this method as well. This covers all existing instances in the app of SCHEME_FILE.

Change-Id: I1f3131b33823eae3e620aa9608be8e72b2e84aa2
Bug: 215212561
 2022-01-31 20:30:24 +00:00
Jake Klinker ebc64c5bae Use UriUtil when checking if a URI is a file. 
UriUtil.isFileUri contains several additional fixes, so this ensure that existing instances where we check for the file scheme use this method as well. This covers all existing instances in the app of SCHEME_FILE.

Change-Id: I1f3131b33823eae3e620aa9608be8e72b2e84aa2
Bug: 215212561
 2022-01-31 20:29:42 +00:00
Jake Klinker a0332cba4f Fix isFileUri to recognize URIs with spaces. am: 6e0ca56095 am: 391770a376 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/16603852

Change-Id: I14c97c261e4512e1631b90911a9c5abd1d1dd9bf
 2022-01-12 01:40:57 +00:00
Jake Klinker 391770a376 Fix isFileUri to recognize URIs with spaces. am: 6e0ca56095 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/16603852

Change-Id: Ic248ca97e7c775e7cef298bf03cdf13c53fb9351
 2022-01-12 01:22:35 +00:00
Jake Klinker 6e0ca56095 Fix isFileUri to recognize URIs with spaces. 
The underlying framework recognizes " file://..." as a valid URI and fetches the file, allowing for a possible exploit (see b/209965112). This trims the URI so that we can properly recognize it as a file from within our code.

Bug: 209965112
Change-Id: I8d9d9100e9a8c3bd64d19015d2177a14ec2306f3
Test: See repro steps on http://b/209965112, was no longer able to repro.
 2022-01-11 00:41:38 +00:00
Jake Klinker 0b258f030a Fix isFileUri to recognize URIs with spaces. 
The underlying framework recognizes " file://..." as a valid URI and fetches the file, allowing for a possible exploit (see b/209965112). This trims the URI so that we can properly recognize it as a file from within our code.

Bug: 209965112
Change-Id: I8d9d9100e9a8c3bd64d19015d2177a14ec2306f3
Test: See repro steps on http://b/209965112, was no longer able to repro.
 2022-01-11 00:38:25 +00:00
Jake Klinker 9c2b23d699 Convert URI scheme to lower case before checking if it is a file. am: 58ee29c68e am: 92ce418906 am: c81f5c1bab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/15998887

Change-Id: I811c332788832b2e79bec9b09fe66635d1cdb696
 2021-10-07 05:58:21 +00:00
Jake Klinker 756a53967d Convert URI scheme to lower case before checking if it is a file. am: 58ee29c68e am: 8a9e12764a am: 58ad3740df 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/15998887

Change-Id: I8b091551d96e91dcdb57110c92d4e465537d3b22
 2021-10-07 05:58:15 +00:00
Jake Klinker c81f5c1bab Convert URI scheme to lower case before checking if it is a file. am: 58ee29c68e am: 92ce418906 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/15998887

Change-Id: I060a8878e5b0ee6d62cc57c849c2ab0a898657fe
 2021-10-07 05:43:44 +00:00
Jake Klinker 58ad3740df Convert URI scheme to lower case before checking if it is a file. am: 58ee29c68e am: 8a9e12764a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/15998887

Change-Id: I8130588d8612124f3b827a93e44f242042edebf2
 2021-10-07 05:42:16 +00:00
Jake Klinker 92ce418906 Convert URI scheme to lower case before checking if it is a file. am: 58ee29c68e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/15998887

Change-Id: I807f76373239f2aceedde821b654ce9de26ecd86
 2021-10-07 05:33:56 +00:00
Jake Klinker 8a9e12764a Convert URI scheme to lower case before checking if it is a file. am: 58ee29c68e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/15998887

Change-Id: I54b996561d0248a4636e0991545cbfc0700e1ee4
 2021-10-07 05:33:56 +00:00
Jake Klinker f93fcd5945 Convert URI scheme to lower case before checking if it is a file. am: 56bacbcb13 am: f40ef350b4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/15998907

Change-Id: I49320ad77b19a9792d787590403d7eacf2d91b37
 2021-10-07 05:04:12 +00:00
Jake Klinker f40ef350b4 Convert URI scheme to lower case before checking if it is a file. am: 56bacbcb13 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/15998907

Change-Id: I708af5f19396bfcbbd6ee0ccea4f38c19c3c4dae
 2021-10-07 04:53:55 +00:00
Jake Klinker 56bacbcb13 Convert URI scheme to lower case before checking if it is a file. 
This fixes an edge case where a "File://" style URI could be passed in
but not pass this check, even though the underlying framework recognizes
this as a legitimate file.

Bug: 197328178
Test: See repro steps on http://b/197328178, was no longer able to
repro.

Change-Id: Id837744a79d1aca91b41d24207dc9b98f2b5b5e9
(cherry picked from commit 9607c95e71)
 2021-10-06 22:38:45 +00:00
Jake Klinker 58ee29c68e Convert URI scheme to lower case before checking if it is a file. 
This fixes an edge case where a "File://" style URI could be passed in
but not pass this check, even though the underlying framework recognizes
this as a legitimate file.

Bug: 197328178
Test: See repro steps on http://b/197328178, was no longer able to
repro.

Change-Id: Id837744a79d1aca91b41d24207dc9b98f2b5b5e9
(cherry picked from commit 9607c95e71)
 2021-10-06 22:38:04 +00:00
Jake Klinker 9607c95e71 Convert URI scheme to lower case before checking if it is a file. 
This fixes an edge case where a "File://" style URI could be passed in
but not pass this check, even though the underlying framework recognizes
this as a legitimate file.

Bug: 197328178
Test: See repro steps on http://b/197328178, was no longer able to
repro.

Change-Id: Id837744a79d1aca91b41d24207dc9b98f2b5b5e9
 2021-10-06 21:17:05 +00:00