Add BasicAuth section

integration/tests/basic_authentication_per_request.curl

@@ -0,0 +1,3 @@
+curl 'http://bob:secret@localhost:8000/basic-authentication-per-request'
+curl 'http://localhost:8000/basic-authentication-per-request' -H 'Authorization: Basic Ym9iOnNlY3JldA=='
+curl 'http://localhost:8000/basic-authentication-per-request' -H 'Authorization: Basic Ym9iOnNlY3JldA=='

integration/tests/basic_authentication_per_request.html

@@ -0,0 +1,15 @@
+<pre><code class="language-hurl"><span class="hurl-entry"><span class="request"><span class="line"><span class="method">GET</span> <span class="url">http://bob:secret@localhost:8000/basic-authentication-per-request</span></span>
+</span><span class="response"><span class="line"><span class="version">HTTP/1.0</span> <span class="number">200</span></span>
+<span class="raw"><span class="line">```You are authenticated```</span></span>
+</span></span><span class="hurl-entry"><span class="request"><span class="line"></span>
+<span class="line"><span class="method">GET</span> <span class="url">http://localhost:8000/basic-authentication-per-request</span></span>
+<span class="line"><span class="string">Authorization</span><span>:</span> <span class="string">Basic Ym9iOnNlY3JldA==</span></span>
+</span><span class="response"><span class="line"><span class="version">HTTP/1.0</span> <span class="number">200</span></span>
+<span class="raw"><span class="line">```You are authenticated```</span></span>
+</span></span><span class="hurl-entry"><span class="request"><span class="line"></span>
+<span class="line"><span class="method">GET</span> <span class="url">http://localhost:8000/basic-authentication-per-request</span></span>
+<span class="line section-header">[BasicAuth]</span>
+<span class="line"><span class="string">bob</span><span>:</span><span class="string">secret</span></span>
+</span><span class="response"><span class="line"><span class="version">HTTP/1.0</span> <span class="number">200</span></span>
+<span class="raw"><span class="line">```You are authenticated```</span></span>
+</span></span></code></pre>

integration/tests/basic_authentication_per_request.hurl

@@ -0,0 +1,14 @@
+GET http://bob:secret@localhost:8000/basic-authentication-per-request
+HTTP/1.0 200
+```You are authenticated```
+
+GET http://localhost:8000/basic-authentication-per-request
+Authorization: Basic Ym9iOnNlY3JldA==
+HTTP/1.0 200
+```You are authenticated```
+
+GET http://localhost:8000/basic-authentication-per-request
+[BasicAuth]
+bob:secret
+HTTP/1.0 200
+```You are authenticated```

integration/tests/basic_authentication_per_request.json

@@ -0,0 +1 @@
+{"entries":[{"request":{"method":"GET","url":"http://bob:secret@localhost:8000/basic-authentication-per-request"},"response":{"version":"HTTP/1.0","status":200,"body":{"type":"raw-string","value":"You are authenticated"}}},{"request":{"method":"GET","url":"http://localhost:8000/basic-authentication-per-request","headers":[{"name":"Authorization","value":"Basic Ym9iOnNlY3JldA=="}]},"response":{"version":"HTTP/1.0","status":200,"body":{"type":"raw-string","value":"You are authenticated"}}},{"request":{"method":"GET","url":"http://localhost:8000/basic-authentication-per-request"},"response":{"version":"HTTP/1.0","status":200,"body":{"type":"raw-string","value":"You are authenticated"}}}]}

integration/tests/user_in_url.py → integration/tests/basic_authentication_per_request.py

@@ -1,8 +1,8 @@
 from tests import app
 from flask import request
 
-@app.route('/user-in-url')
-def user_in_url():
+@app.route('/basic-authentication-per-request')
+def basic_authentication_per_request():
     assert request.headers['Authorization'] == 'Basic Ym9iOnNlY3JldA=='
     return 'You are authenticated'
 

packages/hurl/src/runner/request.rs

@@ -46,6 +46,16 @@ pub fn eval_request(
         headers.push(http::Header { name, value });
     }
 
+    if let Some(kv) = request.clone().basic_auth() {
+        let value = eval_template(kv.value, variables)?;
+        let user_password = format!("{}:{}", kv.key.value, value);
+        let authorization = base64::encode(user_password.as_bytes());
+
+        let name = "Authorization".to_string();
+        let value = format!("Basic {}", authorization);
+        headers.push(http::Header { name, value });
+    }
+
     let mut querystring: Vec<http::Param> = vec![];
     for param in request.clone().querystring_params() {
         let name = param.key.value;

packages/hurl_core/src/ast/core.rs

@@ -80,6 +80,15 @@ impl Request {
         }
         return vec![];
     }
+
+    pub fn basic_auth(self) -> Option<KeyValue> {
+        for section in self.sections {
+            if let SectionValue::BasicAuth(kv) = section.value {
+                return Some(kv);
+            }
+        }
+        None
+    }
 }
 
 #[derive(Clone, Debug, PartialEq, Eq)]
@@ -193,6 +202,7 @@ impl Section {
         match self.value {
             SectionValue::Asserts(_) => "Asserts",
             SectionValue::QueryParams(_) => "QueryStringParams",
+            SectionValue::BasicAuth(_) => "BasicAuth",
             SectionValue::FormParams(_) => "FormParams",
             SectionValue::Cookies(_) => "Cookies",
             SectionValue::Captures(_) => "Captures",
@@ -202,8 +212,10 @@ impl Section {
 }
 
 #[derive(Clone, Debug, PartialEq, Eq)]
+#[allow(clippy::large_enum_variant)]
 pub enum SectionValue {
     QueryParams(Vec<KeyValue>),
+    BasicAuth(KeyValue),
     FormParams(Vec<KeyValue>),
     MultipartFormData(Vec<MultipartParam>),
     Cookies(Vec<Cookie>),

packages/hurl_core/src/format/html.rs

@@ -183,6 +183,7 @@ impl Htmlable for SectionValue {
                     buffer.push_str(item.to_html().as_str())
                 }
             }
+            SectionValue::BasicAuth(item) => buffer.push_str(item.to_html().as_str()),
             SectionValue::FormParams(items) => {
                 for item in items {
                     buffer.push_str(item.to_html().as_str())

packages/hurl_core/src/parser/sections.rs

@@ -49,6 +49,7 @@ fn request_section(reader: &mut Reader) -> ParseResult<'static, Section> {
     let line_terminator0 = line_terminator(reader)?;
     let value = match name.as_str() {
         "QueryStringParams" => section_value_query_params(reader)?,
+        "BasicAuth" => section_value_basic_auth(reader)?,
         "FormParams" => section_value_form_params(reader)?,
         "MultipartFormData" => section_value_multipart_form_data(reader)?,
         "Cookies" => section_value_cookies(reader)?,
@@ -119,6 +120,11 @@ fn section_value_query_params(reader: &mut Reader) -> ParseResult<'static, Secti
     Ok(SectionValue::QueryParams(items))
 }
 
+fn section_value_basic_auth(reader: &mut Reader) -> ParseResult<'static, SectionValue> {
+    let kv = key_value(reader)?;
+    Ok(SectionValue::BasicAuth(kv))
+}
+
 fn section_value_form_params(reader: &mut Reader) -> ParseResult<'static, SectionValue> {
     let items = zero_or_more(key_value, reader)?;
     Ok(SectionValue::FormParams(items))

packages/hurlfmt/src/format/token.rs

@@ -245,6 +245,9 @@ impl Tokenizable for SectionValue {
                     items.iter().flat_map(|e| e.tokenize()).collect(),
                 );
             }
+            SectionValue::BasicAuth(item) => {
+                tokens.append(&mut item.tokenize());
+            }
             SectionValue::FormParams(items) => {
                 add_tokens(
                     &mut tokens,

packages/hurlfmt/src/linter/rules.rs

@@ -169,6 +169,7 @@ impl Lintable<SectionValue> for SectionValue {
             SectionValue::QueryParams(params) => {
                 SectionValue::QueryParams(params.iter().map(|e| e.lint()).collect())
             }
+            SectionValue::BasicAuth(param) => SectionValue::BasicAuth(param.lint()),
             SectionValue::Captures(captures) => {
                 SectionValue::Captures(captures.iter().map(|e| e.lint()).collect())
             }
@@ -191,8 +192,9 @@ impl Lintable<SectionValue> for SectionValue {
 fn section_value_index(section_value: SectionValue) -> u32 {
     match section_value {
         SectionValue::QueryParams(_) => 0,
-        SectionValue::FormParams(_) => 1,
-        SectionValue::MultipartFormData(_) => 2,
+        SectionValue::BasicAuth(_) => 1,
+        SectionValue::FormParams(_) => 2,
+        SectionValue::MultipartFormData(_) => 3,
         SectionValue::Cookies(_) => 3,
         SectionValue::Captures(_) => 0,
         SectionValue::Asserts(_) => 1,