Commit graph

56 commits

Author SHA1 Message Date
Aradhya
ed7b3f54a7 refactor: converted more queries 2021-11-20 15:02:22 +05:30
Ankush Menat
af4ce8156d
fix: remove mutable defaults (#14597)
* fix: mutable defaults

* fix: missing defaults
2021-10-28 09:36:31 +00:00
Gavin D'souza
3446026555 chore: Update header: license.txt => LICENSE
The license.txt file has been replaced with LICENSE for quite a while
now. INAL but it didn't seem accurate to say "hey, checkout license.txt
although there's no such file". Apart from this, there were
inconsistencies in the headers altogether...this change brings
consistency.
2021-09-03 12:02:59 +05:30
Suraj Shetty
4c5959afd6 refactor: Move reset_otp_secret to twofactor.py 2021-08-17 09:54:19 +05:30
Gavin D'souza
e407b78506 chore: Drop dead and deprecated code
* Remove six for PY2 compatability since our dependencies are not, PY2
  is legacy.
* Removed usages of utils from future/past libraries since they are
  deprecated. This includes 'from __future__ ...' and 'from past...'
  statements.
* Removed compatibility imports for PY2, switched from six imports to
  standard library imports.
* Removed utils code blocks that handle operations depending on PY2/3
  versions.
* Removed 'from __future__ ...' lines from templates/code generators
* Used PY3 syntaxes in place of PY2 compatible blocks. eg: metaclass
2021-05-26 15:31:29 +05:30
Suraj Shetty
8875848355 perf(test): Reduce token expiry wait time for test
- Also, reduce lock_interval
2021-05-06 14:49:19 +05:30
leela
1f6f02fd5a fix: Track 2FA OTP attempts using login tracker 2021-03-31 12:49:31 +05:30
Suraj Shetty
88c08e72e6
style: Fix formatting 2020-11-02 16:11:24 +05:30
KanchanChauhan
ae5de5f4a7
refactor: Login Code Size too Small on Mobile
Problem:
Currently, when a Login Code is received on a phone, it appears very small and cannot be copied.

Solution:
Increased the size from default 14 px to 18 px.
2020-10-20 20:07:19 +05:30
Saurabh
df7a575295
fix: Sanitize 2FA response (#11263)
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2020-08-24 11:55:28 +05:30
RJPvT
ebe298113c fix: case where background task had no IP
(cherry picked from commit 67374fdb94937231a7b3f2d4b9fcf5e6323e4e56)
2020-04-30 07:28:04 +00:00
RJPvT
e821d95a01
fix: two_factor_is_enabled needs username 2020-04-19 15:51:47 +02:00
Rushabh Mehta
63e14f6ee2 fix(tests): strict redis 2019-11-07 12:14:09 +05:30
Aditya Hase
d67b995676
fix(security): Use frappe.render_template instead of Template.render 2019-09-20 14:41:28 +05:30
Saurabh
d1bed88f3f Merge branch 'staging' into develop 2019-01-15 19:14:06 +05:30
Aditya Hase
14cedc40ca fix(auth): Decode username, password obtained from cache (#6770) 2019-01-15 11:11:34 +05:30
Stavros Anastasiadis
aed3114a8f Fix conditional statement (#6378) 2018-11-01 18:31:10 +05:30
Chinmay Pai
6e84bbe80d
Merge branch 'develop' into file-api 2018-09-21 13:42:32 +05:30
Chinmay Pai
75c7992557
file-api: add new test, fix minor bugs and code indentation
Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
2018-09-21 13:40:25 +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
Chinmay Pai
5bd66f134d
file-api: add improvements to save() api
file can now be saved by calling save() on the file object instance

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
2018-09-13 09:46:48 +05:30
Chinmay Pai
6eca292e1a
[3/3] file-api: code migration
migrate api from file_manager.py to file.py

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
2018-09-06 01:18:21 +05:30
Chinmay Pai
16a99f5472
[1/3] file-api: code migration
migrate api from file_manager.py to file.py

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
2018-08-31 01:55:15 +05:30
Himanshu Mishra
10361383c1 [fix]: use is_async in background jobs instead of async (#5986) 2018-08-20 10:36:26 +05:30
schilgod
bcaabe5163 Enhancement to allow User to login from any IP if two factor auth is enabled (#5209)
* Enhancement to allow login from any IP if two factor auth is enabled

* Resolve Conflicts

* optimize code
2018-05-25 10:50:24 +05:30
Nabin Hait
010a32d95a
[fix] Header for sms send request (#4417) 2017-11-03 16:20:53 +05:30
Nabin Hait
8db6c97f8a Merge branch 'master' into staging 2017-10-23 13:02:09 +05:30
Nabin Hait
c4adaa653a [fix] Two factor authentication via SMS (#4359) 2017-10-23 13:01:30 +05:30
Aditya Hase
d5d9fd5283 More Python 3 compatibility Frappe test fixes (#4321)
* stream object should be BytesIO instead of StringIO

* Convert filter to list explicitly before checking length

* Decode sent_email and content before string operations
2017-10-17 17:45:49 +05:30
Rushabh Mehta
33caea5e21 Merge pull request #4023 from schilgod/develop
Bypass 2FA if user login from restricted IP Address
2017-09-14 11:23:16 +05:30
Nabin Hait
7266e673ac Merge branch 'master' into develop 2017-09-12 16:09:19 +05:30
mbauskar
90ebd643a7 [hotfix] minor fixes for text editor, report print and 2fa 2017-09-10 11:21:17 +05:30
Sunny
df343aec64 merge with upstream/frappe 2017-09-07 16:04:55 +08:00
Sunny
fe8bae82e8 merge with upstream/frappe 2017-09-07 15:58:56 +08:00
Sunny
d902975080 Bypass 2FA if user login from restricted IP Address 2017-09-07 15:17:35 +08:00
mbauskar
226522746a resolved merge conflicts 2017-09-05 08:41:25 +05:30
Rushabh Mehta
4fcd96a26b Merge pull request #4050 from adityahase/tests3
Python 3 comapatibility Fixes
2017-09-04 20:39:17 +05:30
mbauskar
a8a5347d09 [minor] fixes for https://github.com/frappe/frappe/issues/4035 2017-09-04 17:12:32 +05:30
Aditya Hase
90d7819da9 Use six.iteritems(dict) instead of dict.iteritems() 2017-09-04 16:05:57 +05:30
Mohammed Eldadah
db7ead1435 Update twofactor.py
check twofactors in system settings
2017-09-03 19:40:27 +03:00
Rushabh Mehta
a5096464a7 Merge pull request #3914 from adityahase/fix-stringio-2fa
Import six.StringIO instead of StringIO.StringIO
2017-08-11 13:02:07 +05:30
Aditya Hase
29dfc26a76 Import six.StringIO instead of StringIO.StringIO 2017-08-11 00:40:31 +05:30
Aditya Hase
769338f136 Replaced all instances of basestring with six.string_types 2017-08-11 00:10:11 +05:30
Rushabh Mehta
92403aabba [fix] disable twofactor 2017-08-09 16:27:56 +05:30
Rushabh Mehta
e5138af195 [add] disable 2fa 2017-08-08 14:32:32 +05:30
Rushabh Mehta
bc4d46a362 [fix] style and move setup to system settings 2017-08-08 14:29:22 +05:30
B H Boma
64048e14ac Enable 2fa in sites config instead of system settings, also enabled for admin 2017-08-04 15:59:29 +01:00
B H Boma
8f68d252f0 [fix]Email being sent after each failed login 2017-08-01 18:26:17 +01:00
B H Boma
746c2d6ac8 Tests for twofactor 2017-08-01 14:24:42 +01:00
ckosiegbu
08743b8100 Changes to OTP settings in System Settings 2017-07-31 02:06:23 +01:00