6
6
"""
7
7
8
8
import datetime
9
+ import inspect
9
10
import requests
10
11
import time
11
12
from urllib import parse
@@ -104,7 +105,6 @@ def __init__(self, host, username=None, password=None, token=None, fields_v2=__F
104
105
token = self .__get_token (username , password )
105
106
106
107
self ._headers = {
107
- "User-Agent" : self ._user_agent ,
108
108
"Authorization" : "Token {token}" .format (token = token )
109
109
}
110
110
self ._fields_v2 = fields_v2
@@ -291,7 +291,7 @@ def submit_url_for_analysis(self, url_string, crawler=None, archive_password=Non
291
291
292
292
response = self .__post_request (
293
293
url = url ,
294
- data = data ,
294
+ data = data
295
295
)
296
296
297
297
self .__raise_on_error (response )
@@ -341,7 +341,7 @@ def check_submitted_url_status(self, task_id):
341
341
342
342
url = self ._url .format (endpoint = endpoint )
343
343
344
- response = self .__get_request (url = url )
344
+ response = self .__get_request (url = url , method_name = inspect . currentframe (). f_code . co_name )
345
345
346
346
self .__raise_on_error (response )
347
347
@@ -489,7 +489,10 @@ def get_summary_report_v2(self, sample_hashes, retry=True, fields=None, include_
489
489
"skip_reanalysis" : str (skip_reanalysis ).lower ()
490
490
}
491
491
492
- response = self .__post_request (url = url , data = data )
492
+ response = self .__post_request (
493
+ url = url ,
494
+ data = data
495
+ )
493
496
494
497
self .__raise_on_error (response )
495
498
@@ -628,7 +631,10 @@ def get_detailed_report_v2(self, sample_hashes, retry=False, fields=None, skip_r
628
631
629
632
data ["include_networkthreatintelligence" ] = str (include_networkthreatintelligence ).lower ()
630
633
631
- response = self .__post_request (url = url , data = data )
634
+ response = self .__post_request (
635
+ url = url ,
636
+ data = data
637
+ )
632
638
self .__raise_on_error (response )
633
639
634
640
return response
@@ -803,7 +809,10 @@ def reanalyze_samples_v2(self, hash_input, titanium_cloud=False, titanium_core=F
803
809
"rl_cloud_sandbox_platform" : rl_cloud_sandbox_platform
804
810
}
805
811
806
- response = self .__post_request (url = url , data = data )
812
+ response = self .__post_request (
813
+ url = url ,
814
+ data = data
815
+ )
807
816
808
817
self .__raise_on_error (response )
809
818
@@ -976,15 +985,18 @@ def delete_samples(self, hash_input):
976
985
977
986
data = {"hash_values" : hash_input }
978
987
979
- response = self .__post_request (url = url , data = data )
988
+ response = self .__post_request (
989
+ url = url ,
990
+ data = data ,
991
+ method_name = f"{ self .__class__ .__name__ } { inspect .currentframe ().f_code .co_name } "
992
+ )
980
993
981
994
else :
982
995
raise WrongInputError ("hash_input parameter must be a single hash string or "
983
996
"a list of hash strings of the same type." )
984
997
985
998
self .__raise_on_error (response )
986
999
987
-
988
1000
return response
989
1001
990
1002
def check_sample_removal_status_v2 (self , task_id ):
@@ -1235,7 +1247,10 @@ def set_classification(self, sample_hash, classification, system, risk_score=Non
1235
1247
1236
1248
url = self ._url .format (endpoint = endpoint )
1237
1249
1238
- response = self .__post_request (url = url , data = data )
1250
+ response = self .__post_request (
1251
+ url = url ,
1252
+ data = data
1253
+ )
1239
1254
1240
1255
self .__raise_on_error (response )
1241
1256
@@ -2470,6 +2485,9 @@ def __get_request(self, url, params=None):
2470
2485
:return: response
2471
2486
:rtype: requests.Response
2472
2487
"""
2488
+ self ._headers ["User-Agent" ] = (f"{ self ._user_agent } ; { self .__class__ .__name__ } "
2489
+ f"{ inspect .currentframe ().f_back .f_code .co_name } " )
2490
+
2473
2491
response = requests .get (
2474
2492
url = url ,
2475
2493
verify = self ._verify ,
@@ -2492,6 +2510,9 @@ def __post_request(self, url, post_json=None, files=None, data=None, params=None
2492
2510
:return: response
2493
2511
:rtype: requests.Response
2494
2512
"""
2513
+ self ._headers ["User-Agent" ] = (f"{ self ._user_agent } ; "
2514
+ f"{ self .__class__ .__name__ } { inspect .currentframe ().f_back .f_code .co_name } " )
2515
+
2495
2516
response = requests .post (
2496
2517
url = url ,
2497
2518
json = post_json ,
@@ -2512,6 +2533,9 @@ def __delete_request(self, url, post_json=None):
2512
2533
:return: response
2513
2534
:rtype: requests.Response
2514
2535
"""
2536
+ self ._headers ["User-Agent" ] = (f"{ self ._user_agent } ; { self .__class__ .__name__ } "
2537
+ f"{ inspect .currentframe ().f_back .f_code .co_name } " )
2538
+
2515
2539
response = requests .delete (
2516
2540
url = url ,
2517
2541
json = post_json ,
0 commit comments