Rust: Model more methods.

Author: geoffw0

rust/ql/lib/codeql/rust/frameworks/futures.model.yml

@@ -13,3 +13,7 @@ extensions:
       - ["repo:https://github.com/rust-lang/futures-rs:futures-util", "crate::io::AsyncBufReadExt::read_line", "Argument[self].Reference", "Argument[0].Reference", "taint", "manual"]
       - ["repo:https://github.com/rust-lang/futures-rs:futures-util", "crate::io::AsyncBufReadExt::read_until", "Argument[self]", "Argument[1].Reference", "taint", "manual"]
       - ["repo:https://github.com/rust-lang/futures-rs:futures-util", "crate::io::AsyncBufReadExt::read_until", "Argument[self].Reference", "Argument[1].Reference", "taint", "manual"]
+      - ["repo:https://github.com/rust-lang/futures-rs:futures-util", "crate::io::AsyncBufReadExt::fill_buf", "Argument[self]", "ReturnValue.Future.Field[crate::result::Result::Ok(0)]", "taint", "manual"]
+      - ["repo:https://github.com/rust-lang/futures-rs:futures-util", "crate::io::AsyncBufReadExt::lines", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["repo:https://github.com/rust-lang/futures-rs:futures-util", "crate::stream::stream::StreamExt::next", "Argument[self]", "ReturnValue.Future.Field[crate::option::Option::Some(0)]", "taint", "manual"]
+      - ["repo:https://github.com/rust-lang/futures-rs:futures-util", "<crate::io::buf_reader::BufReader as crate::if_std::AsyncBufRead>::poll_fill_buf", "Argument[self].Reference", "ReturnValue.Field[crate::task::poll::Poll::Ready(0)].Field[crate::result::Result::Ok(0)]", "taint", "manual"]

rust/ql/lib/codeql/rust/frameworks/rustls.model.yml

@@ -9,4 +9,6 @@ extensions:
       extensible: summaryModel
     data:
       - ["repo:https://github.com/quininer/futures-rustls:futures-rustls", "<crate::TlsConnector>::connect", "Argument[1]", "ReturnValue.Future.Field[crate::result::Result::Ok(0)]", "taint", "manual"]
+      - ["repo:https://github.com/quininer/futures-rustls:futures-rustls", "<crate::client::TlsStream as crate::if_std::AsyncRead>::poll_read", "Argument[self].Reference", "Argument[1].Reference", "taint", "manual"]
       - ["repo:https://github.com/rustls/rustls:rustls", "<crate::conn::ConnectionCommon>::reader", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["repo:https://github.com/rustls/rustls:rustls", "<crate::conn::connection::Reader as crate::io::Read>::read", "Argument[self]", "Argument[0].Reference", "taint", "manual"]

rust/ql/test/library-tests/dataflow/sources/test.rs

@@ -783,7 +783,7 @@ fn test_rustls() -> std::io::Result<()> {
     {
         let mut buffer = [0u8; 100];
         let _bytes = reader.read(&mut buffer)?;
-        sink(&buffer); // $ MISSING: hasTaintFlow
+        sink(&buffer); // $ hasTaintFlow=config_arc
     }
 
     {

rust/ql/test/library-tests/dataflow/sources/test_futures_io.rs

@@ -34,8 +34,8 @@ async fn test_futures_rustls_futures_io() -> io::Result<()> {
         let mut cx = Context::from_waker(futures::task::noop_waker_ref());
         let bytes_read = pinned.poll_read(&mut cx, &mut buffer);
         if let Poll::Ready(Ok(n)) = bytes_read {
-            sink(&buffer); // $ MISSING: hasTaintFlow=url
-            sink(&buffer[..n]); // $ MISSING: hasTaintFlow=url
+            sink(&buffer); // $ hasTaintFlow=url
+            sink(&buffer[..n]); // $ hasTaintFlow=url
         }
     }
 
@@ -80,7 +80,7 @@ async fn test_futures_rustls_futures_io() -> io::Result<()> {
     {
         // using the `AsyncBufReadExt::fill_buf` extension method (higher-level)
         let buffer = reader2.fill_buf().await?;
-        sink(buffer); // $ MISSING: hasTaintFlow
+        sink(buffer); // $ hasTaintFlow=url
     }
 
     {
@@ -122,7 +122,7 @@ async fn test_futures_rustls_futures_io() -> io::Result<()> {
     {
         // using the `AsyncBufReadExt::fill_buf` extension method (higher-level)
         let buffer = reader2.fill_buf().await?;
-        sink(buffer); // $ MISSING: hasTaintFlow
+        sink(buffer); // $ hasTaintFlow=url
     }
 
     {
@@ -149,7 +149,7 @@ async fn test_futures_rustls_futures_io() -> io::Result<()> {
     {
         // using the `AsyncBufReadExt::lines` extension method
         let mut lines_stream = reader2.lines();
-        sink(lines_stream.next().await.unwrap()); // $ MISSING: hasTaintFlow
+        sink(lines_stream.next().await.unwrap()); // $ hasTaintFlow=url
         while let Some(line) = lines_stream.next().await {
             sink(line.unwrap()); // $ MISSING: hasTaintFlow
         }