(incubator-opendal) branch main updated: feat(core): fix token leak in OneDrive (#3470)

[xuanwo]

This is an automated email from the ASF dual-hosted git repository.

xuanwo pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-opendal.git


The following commit(s) were added to refs/heads/main by this push:
     new b5a29b992 feat(core): fix token leak in OneDrive (#3470)
b5a29b992 is described below

commit b5a29b9926407eeb39aadd8824e6806e03f5ded1
Author: Morris Tai <morrista...@gmail.com>
AuthorDate: Thu Nov 2 23:22:00 2023 -0400

    feat(core): fix token leak in OneDrive (#3470)
    
    * fix: hide token info in OneDrive
    
    * chore: format import sequence
    
    * chore: drop async as there's no await inside
---
 core/src/services/onedrive/backend.rs |  2 +-
 core/src/services/s3/backend.rs       |  2 +-
 core/src/services/webhdfs/backend.rs  | 11 +++++++----
 core/src/services/webhdfs/writer.rs   | 15 ++++++---------
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/core/src/services/onedrive/backend.rs 
b/core/src/services/onedrive/backend.rs
index 95e052654..b00efd9bd 100644
--- a/core/src/services/onedrive/backend.rs
+++ b/core/src/services/onedrive/backend.rs
@@ -55,7 +55,7 @@ impl Debug for OnedriveBackend {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         let mut de = f.debug_struct("OneDriveBackend");
         de.field("root", &self.root);
-        de.field("access_token", &self.access_token);
+        de.field("access_token", &"<redacted>");
         de.finish()
     }
 }
diff --git a/core/src/services/s3/backend.rs b/core/src/services/s3/backend.rs
index f2157c5dc..1afa5cf02 100644
--- a/core/src/services/s3/backend.rs
+++ b/core/src/services/s3/backend.rs
@@ -42,8 +42,8 @@ use super::error::parse_error;
 use super::error::parse_s3_error_code;
 use super::pager::S3Pager;
 use super::writer::S3Writer;
+use super::writer::S3Writers;
 use crate::raw::*;
-use crate::services::s3::writer::S3Writers;
 use crate::*;
 
 /// Allow constructing correct region endpoint if user gives a global endpoint.
diff --git a/core/src/services/webhdfs/backend.rs 
b/core/src/services/webhdfs/backend.rs
index db72a3467..1c6a5a4cf 100644
--- a/core/src/services/webhdfs/backend.rs
+++ b/core/src/services/webhdfs/backend.rs
@@ -198,7 +198,7 @@ impl WebhdfsBackend {
     /// create object or make a directory
     ///
     /// TODO: we should split it into mkdir and create
-    pub async fn webhdfs_create_object_request(
+    pub fn webhdfs_create_object_request(
         &self,
         path: &str,
         size: Option<usize>,
@@ -430,9 +430,12 @@ impl Accessor for WebhdfsBackend {
 
     /// Create a file or directory
     async fn create_dir(&self, path: &str, _: OpCreateDir) -> 
Result<RpCreateDir> {
-        let req = self
-            .webhdfs_create_object_request(path, Some(0), &OpWrite::default(), 
AsyncBody::Empty)
-            .await?;
+        let req = self.webhdfs_create_object_request(
+            path,
+            Some(0),
+            &OpWrite::default(),
+            AsyncBody::Empty,
+        )?;
 
         let resp = self.client.send(req).await?;
 
diff --git a/core/src/services/webhdfs/writer.rs 
b/core/src/services/webhdfs/writer.rs
index 495fa7fc2..e6d866b9e 100644
--- a/core/src/services/webhdfs/writer.rs
+++ b/core/src/services/webhdfs/writer.rs
@@ -43,15 +43,12 @@ impl oio::OneShotWrite for WebhdfsWriter {
     async fn write_once(&self, bs: &dyn WriteBuf) -> Result<()> {
         let bs = bs.bytes(bs.remaining());
 
-        let req = self
-            .backend
-            .webhdfs_create_object_request(
-                &self.path,
-                Some(bs.len()),
-                &self.op,
-                AsyncBody::Bytes(bs),
-            )
-            .await?;
+        let req = self.backend.webhdfs_create_object_request(
+            &self.path,
+            Some(bs.len()),
+            &self.op,
+            AsyncBody::Bytes(bs),
+        )?;
 
         let resp = self.backend.client.send(req).await?;