Unverified Commit a31a3eca authored by Rick van Schijndel's avatar Rick van Schijndel Committed by GitHub
Browse files

Merge pull request #251066 from lilyinstarlight/feature/prefetch-npm-deps-tokens 

prefetch-npm-deps: add support for NIX_NPM_TOKENS env var
parents 80616a47 7f76ac6e

pkgs/build-support/node/fetch-npm-deps/default.nix

+3 −1
Original line number Diff line number Diff line
@@ -165,7 +165,9 @@ 


      dontInstall = true;



      impureEnvVars = lib.fetchers.proxyImpureEnvVars;

      # NIX_NPM_TOKENS environment variable should be a JSON mapping in the shape of:

      # `{ "registry.example.com": "example-registry-bearer-token", ... }`

      impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [ "NIX_NPM_TOKENS" ];



      SSL_CERT_FILE = if (hash_.outputHash == "" || hash_.outputHash == lib.fakeSha256 || hash_.outputHash == lib.fakeSha512 || hash_.outputHash == lib.fakeHash)

        then "${cacert}/etc/ssl/certs/ca-bundle.crt"

pkgs/build-support/node/fetch-npm-deps/src/main.rs

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ fn fixup_lockfile( 


// Recursive helper to fixup v1 lockfile deps

fn fixup_v1_deps(

    dependencies: &mut serde_json::Map<String, Value>,

    dependencies: &mut Map<String, Value>,

    cache: &Option<HashMap<String, String>>,

    fixed: &mut bool,

) {

pkgs/build-support/node/fetch-npm-deps/src/parse/mod.rs

+2 −2
Original line number Diff line number Diff line
@@ -139,9 +139,9 @@ impl Package { 
            None => Specifics::Registry {

                integrity: pkg

                    .integrity

                    .expect("non-git dependencies should have assosciated integrity")

                    .expect("non-git dependencies should have associated integrity")

                    .into_best()

                    .expect("non-git dependencies should have non-empty assosciated integrity"),

                    .expect("non-git dependencies should have non-empty associated integrity"),

            },

        };

pkgs/build-support/node/fetch-npm-deps/src/util.rs

+13 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ use isahc::{ 
    config::{CaCertificate, Configurable, RedirectPolicy, SslOption},

    Body, Request, RequestExt,

};

use serde_json::{Map, Value};

use std::{env, path::Path};

use url::Url;
@@ -22,6 +23,18 @@ pub fn get_url(url: &Url) -> Result<Body, isahc::Error> { 
        }

    }



    // Respect NIX_NPM_TOKENS environment variable, which should be a JSON mapping in the shape of:

    // `{ "registry.example.com": "example-registry-bearer-token", ... }`

    if let Some(host) = url.host_str() {

        if let Ok(npm_tokens) = env::var("NIX_NPM_TOKENS") {

            if let Ok(tokens) = serde_json::from_str::<Map<String, Value>>(&npm_tokens) {

                if let Some(token) = tokens.get(host).and_then(|val| val.as_str()) {

                    request = request.header("Authorization", format!("Bearer {token}"));

                }

            }

        }

    }



    Ok(request.body(())?.send()?.into_body())

}