From ba934b2716a72c178cf349119357d09794b58aef Mon Sep 17 00:00:00 2001 From: Abhijit Mamarde Date: Wed, 3 Feb 2021 09:40:07 +0530 Subject: [PATCH 1/4] added get_raw_email() which gets body with html --- guerrillamail.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/guerrillamail.py b/guerrillamail.py index 5794819..de0182d 100755 --- a/guerrillamail.py +++ b/guerrillamail.py @@ -73,6 +73,7 @@ def from_response(cls, response_data): dict. """ identity = lambda x: x + # print(f"=== In from_response, response_data: {response_data}") return Mail(**_transform_dict(response_data, { 'guid': ('mail_id', identity), 'subject': ('mail_subject', identity), @@ -164,11 +165,15 @@ def _ensure_valid_session(self, fully_populate=False): def get_email_list(self, offset=0): self._ensure_valid_session() response_data = self._delegate_to_client('get_email_list', offset=offset) + # print(f"=== in get_email_list, response_data: {response_data}") email_list = response_data.get('list') return [Mail.from_response(e) for e in email_list] if email_list else [] def get_email(self, email_id): return Mail.from_response(self._delegate_to_client('get_email', email_id=email_id)) + + def get_raw_email(self, email_id): + return self._delegate_to_client('get_email', email_id=email_id)['mail_body'] class GuerrillaMailClient(object): @@ -200,7 +205,10 @@ def get_email_address(self, session_id=None): def get_email_list(self, session_id, offset=0): if session_id is None: raise ValueError('session_id is None') - return self._do_request(session_id, f='get_email_list', offset=offset) + # return self._do_request(session_id, f='get_email_list', offset=offset) + response_data = self._do_request(session_id, f='get_email_list', offset=offset) + # print(f"=== in get_email_list, returning response_data: {response_data}") + return response_data def get_email(self, email_id, session_id=None): response_data = self._do_request(session_id, f='fetch_email', email_id=email_id) @@ -328,7 +336,7 @@ def cli(*args): settings = load_settings() session = GuerrillaMailSession(**settings) try: - output = get_command(args.command).invoke(session, args) + output = get_command(args.command).invoke(session, args).encode('utf-8') except GuerrillaMailException as e: print(e.message, file=sys.stderr) else: From 2cb827c15b22f5bc555d44a7e151d5e26dbbcaba Mon Sep 17 00:00:00 2001 From: Abhijit Mamarde Date: Wed, 3 Feb 2021 09:44:13 +0530 Subject: [PATCH 2/4] removed debug prints added earlier --- guerrillamail.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/guerrillamail.py b/guerrillamail.py index de0182d..db64ae0 100755 --- a/guerrillamail.py +++ b/guerrillamail.py @@ -73,7 +73,6 @@ def from_response(cls, response_data): dict. """ identity = lambda x: x - # print(f"=== In from_response, response_data: {response_data}") return Mail(**_transform_dict(response_data, { 'guid': ('mail_id', identity), 'subject': ('mail_subject', identity), @@ -165,7 +164,6 @@ def _ensure_valid_session(self, fully_populate=False): def get_email_list(self, offset=0): self._ensure_valid_session() response_data = self._delegate_to_client('get_email_list', offset=offset) - # print(f"=== in get_email_list, response_data: {response_data}") email_list = response_data.get('list') return [Mail.from_response(e) for e in email_list] if email_list else [] @@ -206,9 +204,7 @@ def get_email_list(self, session_id, offset=0): if session_id is None: raise ValueError('session_id is None') # return self._do_request(session_id, f='get_email_list', offset=offset) - response_data = self._do_request(session_id, f='get_email_list', offset=offset) - # print(f"=== in get_email_list, returning response_data: {response_data}") - return response_data + return self._do_request(session_id, f='get_email_list', offset=offset) def get_email(self, email_id, session_id=None): response_data = self._do_request(session_id, f='fetch_email', email_id=email_id) From f899061c98a863f7f2ada1dccd3ec951650c0f97 Mon Sep 17 00:00:00 2001 From: Abhijit Mamarde Date: Wed, 3 Feb 2021 09:49:44 +0530 Subject: [PATCH 3/4] removed commented code left earlier --- guerrillamail.py | 1 - 1 file changed, 1 deletion(-) diff --git a/guerrillamail.py b/guerrillamail.py index db64ae0..56b2154 100755 --- a/guerrillamail.py +++ b/guerrillamail.py @@ -203,7 +203,6 @@ def get_email_address(self, session_id=None): def get_email_list(self, session_id, offset=0): if session_id is None: raise ValueError('session_id is None') - # return self._do_request(session_id, f='get_email_list', offset=offset) return self._do_request(session_id, f='get_email_list', offset=offset) def get_email(self, email_id, session_id=None): From 252f9f0a9e7e77ae6d70a3ff373b2a5a5fcee0f3 Mon Sep 17 00:00:00 2001 From: Abhijit Mamarde Date: Wed, 5 Jan 2022 12:14:24 +0530 Subject: [PATCH 4/4] fix for ignoring certificate errors --- guerrillamail.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guerrillamail.py b/guerrillamail.py index 56b2154..980e81b 100755 --- a/guerrillamail.py +++ b/guerrillamail.py @@ -188,7 +188,7 @@ def _do_request(self, session_id, **kwargs): kwargs['ip'] = self.client_ip if session_id is not None: kwargs['sid_token'] = session_id - response = requests.get(url, params=kwargs) + response = requests.get(url, params=kwargs, verify=False) try: response.raise_for_status() except requests.HTTPError as e: