Commit graph

115 commits

Author SHA1 Message Date
Saurabh
07e4885775 fix: renaming of fields and test fixes 2020-10-20 13:19:12 +05:30
Saurabh
b23e2cc311 fix: handle encoding exceptions while appending email to sent email folder 2020-08-06 19:09:35 +05:30
Suraj Shetty
a6c68f7dc0
fix: Initialize email_sent_to_any_recipient outsite try block (#10866)
to avoid UnboundLocalError: local variable
'email_sent_to_any_recipient' referenced before assignment
2020-06-30 17:38:27 +05:30
Abhishek Kedar
205c852f1c
fix: removed from_test parameter in send_one function
from_test parameter is not at all used anywhere in the send_one function so removed it, and its value will be always False.
2020-04-28 11:32:24 +05:30
Abhishek Kedar
fda7a45c52
fix: corrected flush job for passing test_flush 2020-04-27 18:25:16 +05:30
Abhishek Kedar
47446469bd
refactor: moved import to the top of the file 2020-04-13 20:20:02 +05:30
Abhishek Kedar
8e9d642f44
style: formatted parameters of enqueue function 2020-04-13 20:11:54 +05:30
Abhishek Kedar
7b10a2d88a
style: removed comment and formatted dictionary 2020-04-13 20:07:46 +05:30
Abhishek Kedar
5b170c031d
perf: enqueue instance of send_one for better performance
Usecase: Suppose I have hundred's of emails in the Email Queue and the flush job executes. While the execution of the flush job is going another flush job starts and so on. Because of this a list of flush jobs gets lined up in the background jobs queue. 
To avoid this it is better to enqueue the send_one function inside the flush job this will very efficiently improve the performance of the flush job.
2020-04-13 16:40:09 +05:30
sahil28297
b1d42e1302
fix: consider Not Sent and Sending status while pulling daily e… (#9496)
Co-authored-by: Saurabh <saurabh6790@gmail.com>
2020-02-18 15:43:16 +05:30
Chinmay D. Pai
ce2a0854db
fix(email): safe_encode to avoid smtp ascii encoding issue
fixes issue where smtplib fails to encode the mail as ascii

Traceback (most recent call last):
  File "/home/frappe/frappe-bench/apps/frappe/frappe/app.py", line 60, in application
    response = frappe.api.handle()
  File "/home/frappe/frappe-bench/apps/frappe/frappe/api.py", line 55, in handle
    return frappe.handler.handle()
  File "/home/frappe/frappe-bench/apps/frappe/frappe/handler.py", line 22, in handle
    data = execute_cmd(cmd)
  File "/home/frappe/frappe-bench/apps/frappe/frappe/handler.py", line 61, in execute_cmd
    return frappe.call(method, **frappe.form_dict)
  File "/home/frappe/frappe-bench/apps/frappe/frappe/__init__.py", line 1042, in call
    return fn(*args, **newargs)
  File "/home/frappe/frappe-bench/apps/frappe/frappe/core/doctype/user/user.py", line 801, in reset_password
    user.reset_password(send_email=True)
  File "/home/frappe/frappe-bench/apps/frappe/frappe/core/doctype/user/user.py", line 234, in reset_password
    self.password_reset_mail(link)
  File "/home/frappe/frappe-bench/apps/frappe/frappe/core/doctype/user/user.py", line 253, in password_reset_mail
    "password_reset", {"link": link}, now=True)
  File "/home/frappe/frappe-bench/apps/frappe/frappe/core/doctype/user/user.py", line 298, in send_login_mail
    delayed=(not now) if now!=None else self.flags.delay_emails, retry=3)
  File "/home/frappe/frappe-bench/apps/frappe/frappe/__init__.py", line 476, in sendmail
    inline_images=inline_images, header=header, print_letterhead=print_letterhead)
  File "/home/frappe/frappe-bench/apps/frappe/frappe/email/queue.py", line 162, in send
    print_letterhead=print_letterhead)
  File "/home/frappe/frappe-bench/apps/frappe/frappe/email/queue.py", line 185, in add
    send_one(email_queue.name, now=True)
  File "/home/frappe/frappe-bench/apps/frappe/frappe/email/queue.py", line 475, in send_one
    raise e
  File "/home/frappe/frappe-bench/apps/frappe/frappe/email/queue.py", line 415, in send_one
    smtpserver.sess.sendmail(email.sender, recipient.recipient, message)
  File "/usr/lib64/python3.6/smtplib.py", line 855, in sendmail
    msg = _fix_eols(msg).encode('ascii')
UnicodeEncodeError: 'ascii' codec can't encode characters in position 335-339: ordinal not in range(128)

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-01-03 14:56:15 +05:30
Chinmay D. Pai
4c138390b6
fix: move email status check to fix travis
mail status wasn't being set when the check was run, so the output for
any() would always be false, and none of the mails would have status set
to sent in the backend. moving the check to a point after setting status
for each email should fix this issue

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-01-01 11:21:53 +05:30
Suraj Shetty
e2935b5ba6 refactor: Commonify sent mail checks
-and fix formatting
2019-12-31 21:09:40 +05:30
Suraj Shetty
295c5f89f1
Merge branch 'develop' into email_ssl 2019-12-31 20:47:11 +05:30
Chinmay D. Pai
6357a4a9a5
feat(email): allow ssl for outgoing emails, append to sent folder
* dont always use default outgoing account for sending
* allow ssl for outgoing emails

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2019-12-18 16:18:44 +05:30
cjpit
f34af5bc25 fix: rfc5322 compliance for python3 (#8912)
* start of tests

* rfc compliant emails for frappe.

* fix for deepsource

* fix length of strings.

* fix bug that I'm not sure where it came from?

* codacy and deepsource issues trying to keep them happy

* take a punt in the dark

* fix: use SMTPUTF8 instead of SMTP and other minor fixes

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2019-12-17 14:01:52 +05:30
Rushabh Mehta
7cd329fac9 reactor(scheduler): created "Scheduler Job Type" and cleaned up scheduler 2019-11-07 12:14:09 +05:30
sahil28297
d53dc85fc1
fix(queue): use send_one as email_queue is now an object
TypeError: 'EmailQueue' object is not callable
2019-10-31 18:55:03 +05:30
Saurabh
6d8da3e057 fix: handle smtp recipients refused exception 2019-09-29 18:15:57 +05:30
gavin
67550fd9a2 fix: fixed email count for current month (#8454) 2019-09-18 22:55:19 +05:30
deepeshgarg007
8521e4f51e fix: Remove email limit check from frappe 2019-08-13 17:06:00 +05:30
Suraj Shetty
b6c56ff94f fix(postres): Pass tuple of all_ids instead of an array
- Fixes failing build for postgres
2019-06-19 11:18:57 +05:30
Nabin Hait
b375ee9eef fix: merge conflict 2019-06-18 18:45:21 +05:30
Himanshu Mishra
0fa0d4324a perf: Don't fetch complete global unsubscribe (#7578)
* Update queue.py

* Update email_unsubscribe.json

* Update email_unsubscribe.json
2019-05-29 17:49:48 +05:30
Sagar Vora
17b20b22a3 Merge branch 'master' into develop 2019-02-12 16:31:54 +05:30
Faris Ansari
1d5310166d fix: Set default print language in Notification 2019-02-07 18:18:01 +05:30
Sagar Vora
47c0d10631 Merge branch 'staging' into develop 2019-01-22 15:43:40 +05:30
Sagar Vora
2d166e7513 Merge branch 'master' into staging-fixes 2019-01-22 15:24:48 +05:30
Zarrar
3d95621cd5 feat(email): Retry sending Email 3 times before deeming it as error (#6754)
* added field to note number of retries

* incase of unprecedented errors increase retry counter and try sending again
2019-01-18 13:33:59 +05:30
Faris Ansari
f23700d33a
Merge pull request #6586 from Thunderbottom/email-attachment-fix
communication: fix attachments in email queue and generated reports
2018-12-07 16:38:05 +05:30
Chinmay Pai
ba0045ef1f
communication: fix attachments in email queue and generated reports
so, apparently i messed up some things that were responsible for handling file attachments in email queue and attached on-the-fly generated reports. these issues should be fixed now.

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
2018-12-06 18:12:34 +05:30
Aditya Hase
f93a141a73 fix(email-queue): Record raised exception and traceback in Error Log 2018-11-15 16:22:13 +05:30
Ameya Shenoy
d0e7690ae2
Merge branch 'staging' into develop 2018-11-05 06:48:46 +00:00
Ameya Shenoy
2ead222090 fix(email): Email status changes to Read (#6396)
The email recieved template was in unsubscribe email. Hence it
didn't used to function in case the emails were sent from DocTypes
like Issue, wherein the unsubscribe email template is not used.
Moved it to email_footer template.

Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>
2018-11-05 10:49:18 +05:30
Ameya Shenoy
e551153ea0
Merge branch 'staging' into develop 2018-09-26 07:21:28 +00:00
Ameya Shenoy
3b4f364919
Merge branch 'master' into staging-fixes 2018-09-26 07:12:30 +00:00
rohitwaghchaure
a8423dd782 [Fix] Email not sending if reciepients is blank because of reciepients is unsubscribed (#6136) 2018-09-25 15:37:26 +05:30
Chinmay Pai
6e84bbe80d
Merge branch 'develop' into file-api 2018-09-21 13:42:32 +05:30
Rushabh Mehta
2e6a202652 Postgres support for Frappe (#5919)
* [start] postgres

* [wip] started refactoring db_schema

* Add psycopg2 to requirements.txt

* Add support for Postgres SQL

- Separate frameworkSQL, database, schema, setup_db file for
mariaDB and postgres
- WIP

* Remove quotes from sql to make it compatible with postgres as well

* Moved some code from db_schema to database.py

* Move code from db_schema to schema.py

Add other required refactoring

* Add schema chages

* Remove redundant code in file

* Add invalid column name exception class to exceptions.py

* Add back tick in query wherever needed and replace ifnull with coalesce

* Update get_column_description code in database.py file

* Remove a print statement

* Add keys to get on_duplicate query

* Add bactick wherever necessary

- Remove db_schema.py file

* Remove DATE_SUB as it is incompatible with postgres

- Fix prepare_filter_condition

* Add backtick and quotes wherever necessary
- Move get_database_size to frappe.db namespace
- fix some left out bugs and errors

* Add code to create key and unique index
- added mysql and posgres in their respective database.py

* Add more bacticks in queries and fix some errors
- Pass keys to on_duplicate_update method
- Replace MONTH with EXTRACT function
- Remove DATEDIFF and CURDATE usage

* Cast state value to int in toggle_two_factor_auth
- since two_factor_auth has the datatype of Int

* Refactor
- Replace Timediff with normal arithmetic operator
- Add MAX_COLUMN_LENGTH
- Remove Redundant code
- Add regexp character constant
- Move create_help_table to database.py
- Add get_full_text_search_condition method
- Inherit MariaDBTable from DBTable

* Replace Database instance with get_db method

* Move db_manager to separate file

* Refactor
- Remove some unwanted code
- Separate alter table code for postgres and mysql
- Replace data_type with column_type in database.py

* Make fulltext search changes in global_search.py

* Add empty string check

* Add root_password to site config

* Create cli command for postgres console

* Move setup of help database to setup_db.py

* Add get_database_list method

* Fix exception handling
- Replace bad_field handler with missing_column handler

* Fix tests and sql queries

* Fix import error

* Fix typo db -> database

* Fix error with make_table in help.py

* Try test for postgres

* Remove pyhton 2.7 version to try postgres travis test

* Add test fixes

* Add db_type to the config of test_site_postgres

* Enable query debug to check the reason for travis fail

* Add backticks to check if the test passes

* Update travis.yml
- Add postgres addon

* Try appending 'd_' to hash for db_name
- since postgres does not support dbname starting with a number

* Try adding db_type for global help to make travis work

* Add print statements to debug travis failure

* Enable transaction and remove debug flag

* Fix help table creation query (postgres)

* Fix import issue

* Add some checks to prevent errors
- Some doctypes used to get called even before they are created

* Try fixes

* Update travis config

* Fix create index for help table

* Remove unused code

* Fix queries and update travis config

* Fix ifnull replace logic (regex)

* Add query fixes and code cleanup

* Fix typo
- get_column_description -> get_table_columns_description

* Fix tests
- Replace double quotes in query with single quote

* Replace psycopg2 with psycopg2-binary to avoid warnings
- http://initd.org/psycopg/docs/install.html#binary-install-from-pypi

* Add multisql api

* Add few multisql queries

* Remove print statements

* Remove get_fulltext_search_condition method and replace with multi query

* Remove text slicing in create user

* Set default for 'values' argument in multisql

* Fix incorrect queries and remove few debug flags
- Fix multisql bug

* Force delete user to fix test
- Fix Import error
- Fix incorrect query

* Fix query builder bug

* Fix bad query

* Fix query (minor)

* Convert boolean text to int since is_private has datatype of int
- Some query changes like removed double quotes
and replace with interpolated string to pass multiple
value pass in one of the query

* Extend database class from an object to support python 2

* Fix query
- Add quotes around value passed to the query for variable comparision

* Try setting host_name for each test site
- To avoid "RemoteDisconnected" error while testing data migration test
- Update travis.yml to add hosts
- Remove unwanted commit in setup_help_database

* Set site hostname to data migration connector (in test file)
- To connect the same site host

* Fix duplicate entry issue
- the problem is in naming series file.
In previous commits I unknowingly changed a part of a series query
due to which series were not getting reset

* Replace few sql queries with orm methods

* Fix codacy

* Fix 'Doctype Sessions not found' issue

* Fix bugs induced during codacy fixes

* Fix Notification Test

- Use ORM instead of raw sql

* Set Date fallback value to 0001-01-01

- 0000-00-00 is invalid date in Postgres
- 0001-01-01 works in both

* Fix date filter method

* Replace double quotes with single quote for literal value

* Remove print statement

* Replace double quotes with single

* Fix tests

- Replace few raw sql with ORM

* Separate query for postgres

- update_fields_to_fetch_query

* Fix tests

- replace locate with strpos for postgres

* Fix tests

- Skip test for datediff
- convert bytes to str in escape method

* Remove TestBot

* Skip fieldname extraction

* Replace docshare raw sql with ORM

* Fix typo

* Fix ancestor query test

* Fix test data migration

* Remove hardcoded hostname

* Add default option and option list for db_type

* Remove frappe.async module

* Remove a debug flag from test

* Fix codacy

* fix import issue

* Convert classmethod to static method

* Convert few instance methods to static methods

* Remove some unused imports

* Fix codacy

- Add exception type
- Replace few instance methods with static methods
- Remove unsued import

* Fix codacy

* Remove unused code

* Remove some unused codes

- Convert some instance methods to static function

* Fix a issue with query modification

* Fix add_index query

* Fix query

* Fix update_auth patch

* Fix a issue with exception handling

* Add try catch to a reload_doc

* Add try-catch to file_manager_hook patch

* import update_gravatar to set_user_gravatar patch

* Undo all the wrong patch fixes

* Fix db_setup code 😪
- previously it was not restoring db from source SQL
which is why few old patched were breaking
(because they were getting different schema structure)

* Fix typo !

* Fix exception(is_missing_column) handling

* Add deleted code
- This code is only used in a erpnext patch.
Can be moved to that patch file

* Fix codacy

* Replace a mariadb specific function in a query used in validate_series

* Remove a debug flag

* Revert changes (rename_parent_and_child)

* Fix validate_one_root method

* Fix date format issue

* Fix codacy
- Disable a pylint for variable argument warning
- Convert an instance method to static method

* Add bandit.yml

The Codacy seems to use Bandit which generates
warning for every subprocess import and its usage during pytest
Since we have carefully used subprocess (avoided user input),
warnings needs to be avoided.
This can be removed if we have any alternative for subprocess usage.

* Skip start_process_with_partial_path check

* Fix typo

* Add python 2.7 test

* Move python versions in travis.yml

* Add python versions to jobs

* Overwrite python version inheritance for postgres in travis.yml

* Add quotes around python version in .travis.yml

* Add quotes around the name of the job

* Try a travis fix

* Try .travis.yml fix

* Import missing subprocess

* Refactor travis.yml

* Refactor travis.yml
- move install and tests commands to separate files
- Use matrix to build combination of python version and db type

* Make install.sh and run-tests.sh executable

* Add sudo required to travis.yml to allow sudo cmmands in shell files

* Load nvm

* Remove verbose flag from scripts

* Remove command-trace-print flag

* Change to build dir in before script

* Add absolute path for scripts

* Fix tests

* Fix typo

* Fix codacy
- fixes - "echo won't expand escape sequences." warning

* Append (_) underscore instead of 'd' for db_name

* Remove printf and use mysql execute flag
2018-09-21 10:20:48 +05:30
Ameya Shenoy
7c2fceb6b7
email: fix track_email_status not working
the initial method was not able to get the track_email_status value if
the email account had been set in site_config, the current method checks
for the same

Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>
2018-09-10 18:57:22 +05:30
Chinmay Pai
8943f6cfd5
file-api: migration improvements and fixes
* migrate more functions to file class
* add get_content(), returns file content from file_name
* move get_file_path() to get_full_path() to decrease naming ambiguity

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
2018-09-06 17:30:33 +05:30
Chinmay Pai
22ba310aaf
[2/3] file-api: code migration
migrate api from file_manager.py to file.py

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
2018-09-03 18:04:45 +05:30
Ameya Shenoy
4b89e0d5b5 Email Read notification (#5911)
* Email Read notification

* changed email status from Opened to Read
2018-08-10 12:00:51 +05:30
Rushabh Mehta
aef1046b1f
[email] remove style from email so it does not mess up desk (#5860)
* [email] remove style from email so it does not mess up desk

* [fix] tests

* [fix] image parsing, #savedbyatestcase

* [fix] timeout issues in test

* [fix] timeout issues in test
2018-07-24 17:00:14 +05:30
Rushabh Mehta
db3a950db3
[email] smtp connection per sender (#5791)
* [fix]email error due to incorrect smtp server auth

- A dict of smtpserver objects is created for every sender
- A smtp server object is created if not present for the given sender
- smtpserver object is picked based on the sender of the mail

* [fix] remove cache from queue.py
2018-07-06 18:31:13 +05:30
Rushabh Mehta
7a532a4f21 [fix] remove cache from queue.py 2018-07-06 17:58:53 +05:30
Ameya Shenoy
f8269e3ad6 [fix]email error due to incorrect smtp server auth
- A dict of smtpserver objects is created for every sender
- A smtp server object is created if not present for the given sender
- smtpserver object is picked based on the sender of the mail
2018-07-06 14:08:11 +05:30
Nabin Hait
ef536e055b Merge branch 'master' into develop 2018-04-07 19:57:04 +05:30
rohitwaghchaure
4c032eabbe Removed owner of the document from the BCC (#5401) 2018-04-07 19:55:45 +05:30
Achilles Rasquinha
c251236e43 [FIX] module has no safe_decode 2018-03-08 14:53:36 +05:30