[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [Git][tpo/applications/tor-browser-build][main] Bug 41422: Disable viaduct.



Title: GitLab

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build

Commits:

  • 400bfa13
    by Pier Angelo Vendrame at 2025-04-03T18:38:46+02:00
    Bug 41422: Disable viaduct.
    
    Viaduct is an application services component for doing HTTP requests.
    We do not want to use any online service in Tor Browser, but to be on
    the safe side, we return an error shall even a request be attempted.
    

3 changed files:

Changes:

  • projects/application-services/41422-disable-viaduct.diff
    1
    +diff --git a/components/viaduct/src/backend/ffi.rs b/components/viaduct/src/backend/ffi.rs
    
    2
    +index cca6bc68f..5d11eb026 100644
    
    3
    +--- a/components/viaduct/src/backend/ffi.rs
    
    4
    ++++ b/components/viaduct/src/backend/ffi.rs
    
    5
    +@@ -37,6 +37,8 @@ macro_rules! backend_error {
    
    6
    + pub struct FfiBackend;
    
    7
    + impl Backend for FfiBackend {
    
    8
    +     fn send(&self, request: crate::Request) -> Result<crate::Response, Error> {
    
    9
    ++        return Err(backend_error!("Viaduct is disabled in Tor Browser."));
    
    10
    ++
    
    11
    +         use ffi_support::IntoFfi;
    
    12
    +         use prost::Message;
    
    13
    +         super::note_backend("FFI (trusted)");

  • projects/application-services/build
    ... ... @@ -107,6 +107,7 @@ popd
    107 107
       patch -p1 < $rootdir/ohttp-no-git.diff
    
    108 108
       patch -p1 < $rootdir/bug40485-nimbus-fml-reproducibility.diff
    
    109 109
       patch -p1 < $rootdir/offline-nimbus-fml.diff
    
    110
    +  patch -p1 < $rootdir/41422-disable-viaduct.diff
    
    110 111
       gradle_flags="--offline --no-daemon"
    
    111 112
       gradle $gradle_flags assembleRelease
    
    112 113
       gradle $gradle_flags publish
    

  • projects/application-services/config
    ... ... @@ -82,6 +82,7 @@ steps:
    82 82
           - filename: glean-noop.diff
    
    83 83
           - filename: a-s-noop.diff
    
    84 84
           - filename: cargo-no-build.sh
    
    85
    +      - filename: 41422-disable-viaduct.diff
    
    85 86
     
    
    86 87
       list_toolchain_updates:
    
    87 88
         git_hash: 'v[% c("version") %]'
    

  • _______________________________________________
    tor-commits mailing list -- tor-commits@xxxxxxxxxxxxxxxxxxxx
    To unsubscribe send an email to tor-commits-leave@xxxxxxxxxxxxxxxxxxxx