Add Accept header

Fedora infra needs it (otherwise packit is treated like any other AI bot and it is given back the Anubis page).

Author: majamassarini

ogr/services/pagure/project.py

@@ -137,6 +137,7 @@ def _call_project_api_raw(
         method: Optional[str] = None,
         params: Optional[dict] = None,
         data: Optional[dict] = None,
+        header: Optional[dict] = None,
     ) -> RequestResponse:
         """
         Call project API endpoint.
@@ -152,6 +153,7 @@ def _call_project_api_raw(
             method: Method of the HTTP request, e.g. `"GET"`, `"POST"`, etc.
             params: HTTP(S) query parameters in form of a dictionary.
             data: Data to be sent in form of a dictionary.
+            header: HTTP request header, dict that will update default headers
 
         Returns:
             `RequestResponse` object containing response.
@@ -167,6 +169,7 @@ def _call_project_api_raw(
             method=method,
             params=params,
             data=data,
+            header=header,
         )
 
     def _get_project_url(self, *args, add_fork_part=True, add_api_endpoint_part=True):
@@ -462,14 +465,17 @@ def add_user_or_group(
     def change_token(self, new_token: str) -> None:
         self.service.change_token(new_token)
 
-    def get_file_content(self, path: str, ref=None) -> str:
+    def get_file_content(self, path: str, ref=None, header=None) -> str:
         ref = ref or self.default_branch
+        # This method is used for retrieving packit.yaml
+        header = {"Accept": "application/yaml"} if header is None else header
         result = self._call_project_api_raw(
             "raw",
             ref,
             "f",
             path,
             add_api_endpoint_part=False,
+            header=header,
         )
 
         if not result or result.status_code == HTTPStatus.NOT_FOUND:

ogr/services/pagure/service.py

@@ -59,6 +59,8 @@ def __init__(
             self.session.mount("https://", adapter)
 
         self.header = {"Authorization": "token " + self._token} if self._token else {}
+        # By default ogr deals with Pagure API -> json
+        self.header["Accept"] = "application/json"
 
         if user_agent:
             self.header |= {"User-Agent": user_agent}
@@ -193,6 +195,7 @@ def call_api_raw(
         url: str,
         method: Optional[str] = None,
         params: Optional[dict] = None,
+        header: Optional[dict] = None,
         data=None,
     ):
         """
@@ -202,6 +205,7 @@ def call_api_raw(
             url: URL to be called.
             method: Method of the HTTP request, e.g. `"GET"`, `"POST"`, etc.
             params: HTTP(S) query parameters in form of a dictionary.
+            header: HTTP request header, dict that will update default headers
             data: Data to be sent in form of a dictionary.
 
         Returns:
@@ -216,6 +220,7 @@ def call_api_raw(
                 url=url,
                 params=params,
                 data=data,
+                header=header,
             )
 
         except requests.exceptions.ConnectionError as er:
@@ -257,14 +262,22 @@ def get_raw_request(
             ValueError, if JSON cannot be retrieved.
         """
 
+        updated_header = (
+            {**self.header, **header} if header is not None else self.header
+        )
+
         response = self.session.request(
             method=method,
             url=url,
             params=params,
-            headers=header or self.header,
+            headers=updated_header,
             data=data,
             verify=not self.insecure,
         )
+        headers_to_log = updated_header.copy()
+        if "Authorization" in headers_to_log:
+            headers_to_log["Authorization"] = "<redacted>"
+        logger.debug(f"Ogr sent request with following headers: {headers_to_log}")
 
         json_output = None
         try: