Commit Graph

31231 Commits

Author SHA1 Message Date
Kevin Reed c03764ecb0
Merge pull request #2416 from BOINC/dpa_job_params
remote job submission: add optional "job params" for batchs
2018-05-09 12:57:40 -05:00
tristanolive 3d11607839
Merge pull request #2478 from drshawnkwang/drupal_feature-newpasswdhash
Drupal: Changed password hash algorithm to match upstream changes.
2018-05-09 09:33:51 -04:00
Kevin Reed 940924c9ff
Merge pull request #2505 from BOINC/dpa_db_comments
Update comments in db/schema.sql
2018-05-09 08:17:23 -05:00
Kevin Reed f551dd8776 web/server: when a user deletes their account (wipe), set results in progress
and results returned but not yet validated to "Client
Detached/Abandoned" status.  Let valid results remain.  In all cases set
userid and hostid to 0
2018-05-08 17:15:05 -05:00
Keith Uplinger 4168861960 Added comments for recover_email.php 2018-05-08 15:38:41 -05:00
Keith Uplinger 0d78176e1f Change phrasing in the edit_email_form.php 2018-05-08 15:36:54 -05:00
Keith Uplinger 9cd7d63ca8 Change error code for duplicate email addresses found in am_set_info.php 2018-05-08 15:35:37 -05:00
Shawn Kwang 0a046c19b3 web: Fixed bug found by Scrutinizer. 2018-05-08 15:15:41 -05:00
Keith Uplinger e82a6984cd Fixed Scrutinizer issue where variables were declared blank but declared later with string value in inc/email.inc 2018-05-08 15:14:10 -05:00
Kevin Reed fd25c43ca4 server: change create_time on host_deleted and user_deleted to double
from int
2018-05-08 14:43:16 -05:00
Shawn Kwang 6fa9a01ea6 web: Add an opt-in consent form to login workflow.
When a user logs in, and they have not yet consented, the user is presented with a form to consent to the Terms of Use. This adds or modifies records in the consent table.
Supported logins are: web form, authenticator, email_link, and ldap.
2018-05-08 14:36:05 -05:00
Keith Uplinger 8c9626fee8 Changed setting previous_email_addr to blank instead of null since that is not allowed int the default schema definition. 2018-05-08 13:37:24 -05:00
Keith Uplinger 387d59643f Fixed problem with bad constant called for invalid email address in am_set_info.php 2018-05-08 12:11:29 -05:00
Keith Uplinger 5cead5fb55 Added check in am_set_info to return an error if the email address was changed within 7 days. 2018-05-08 12:08:31 -05:00
Keith Uplinger 94a6687009 am_set_info, if email address is the same as the user, then do nothing with changing the email address. 2018-05-08 10:33:41 -05:00
Shawn Kwang d433bedd02 web: Fixed bugs found by Scrutinizer. 2018-05-08 10:25:13 -05:00
Keith Uplinger 7749c643a6 Added database call for previous email address in c++ code. 2018-05-08 10:02:34 -05:00
Keith Uplinger 69643829a4 Updated comments in a few places for email address changes. 2018-05-08 08:48:19 -05:00
Keith Uplinger cbcbb5e34a Merge remote-tracking branch 'upstream/keith_email' into email_change_notification
Conflicts:
	html/user/am_set_info.php
	html/user/edit_email_form.php
	html/user/recover_email.php
2018-05-08 08:28:54 -05:00
Keith Uplinger 2905e50dfe Cleaned up text within email recovery pages.
Also, removed excessive code and added an else statement for cleanup
2018-05-07 22:54:28 -05:00
Keith Uplinger e874a86dab Removed call to BoincDb::get() as it called within escape_string function. 2018-05-07 22:50:06 -05:00
David Anderson d0fcd1e729 Various tweaks to Keith's changes.
Keith, call me if you want to discuss any of these.
2018-05-07 16:15:51 -07:00
David Anderson 128fcda228 Add fields at end of table 2018-05-07 15:23:01 -07:00
David Anderson cc3171fa5b Update comments in db/schema.sql
Please read these before changing the schema.
Recent schema changes don't follow these rules.
At some point they should be revised.
2018-05-07 15:13:14 -07:00
Kevin Reed 4720ab77b4 web: fix issue with password hash caused by merge from master 2018-05-07 16:39:58 -05:00
Kevin Reed ec98197f23 web: fix bug introduced during merge 2018-05-07 13:31:09 -05:00
Kevin Reed cff14c4107 Merge branch 'master' into knr_right_to_erase
Conflicts:
	html/inc/user_util.inc
2018-05-07 13:09:18 -05:00
Kevin Reed f868227915 web/server: change primary key of user_deleted to userid and
host_deleted to hostid
2018-05-07 11:17:45 -05:00
Shawn Kwang 49599f2977 web ops: Add manage consent type page to HTML admin ops.
Admin may add addiational consent types to the table.
2018-05-04 18:43:52 -05:00
Shawn Kwang 0537feba0c web: Add functionality of consent to Web site and RPCs.
create_account RPC modified to record a user's consent.
am_set_info RPC modified to allow for modification of user's consent.
Account registration on Web site modified to show terms_of_use.txt file and record user's consent.
2018-05-04 18:42:05 -05:00
Shawn Kwang 23640e9a8a web: Add new tables to database.
Add tables consent and consent_type. Projects automatically created with a pre-defined consent_type. When projects update database, pre-defined consent_type will be added as well.
2018-05-04 18:40:14 -05:00
Kevin Reed bcd853bb4f web: implementation of wipe account 2018-05-04 17:36:09 -05:00
Kevin Reed b4f0bae523 server: db_dump shouldn't export create_time for user_deleted or
host_deleted
2018-05-03 15:54:42 -05:00
Kevin Reed ae17dfb09e server: add user_deleted and host_deleted output files for db_dump.
Also modify db_dump to exclude user records whose authenticator starts
with 'deleted' or host domain names that equal 'deleted'.  Those values
are set by the obfuscate delete method.
2018-05-03 15:31:42 -05:00
Kevin Reed b7bb437aba web: change primary key for user_deleted and host_deleted to simply be
id instead of userid and hostid
2018-05-03 10:38:22 -05:00
Kevin Reed 695e6f9ad4
Merge pull request #2501 from BOINC/dpa_passwd_hash
Factor passwd hash logic into a function
2018-05-03 09:04:46 -05:00
David Anderson 678f151037 Factor passwd hash logic into a function
... rather than having it duplicated in 3 places.
Please review https://boinc.berkeley.edu/trac/wiki/CodingStyle
2018-05-02 20:09:37 -07:00
Kevin Reed 4002f6d372 web: add logic to insert into user_deleted and host_deleted when account
is removed from the system.  add task to remove entries from those
tables after 60 days.
2018-05-02 15:36:57 -05:00
Keith Uplinger 4aa5acbc45 Changed email.inc so that it will look for older version of PHPMailer as well as the latest 6.0.x version. 2018-05-02 13:36:16 -05:00
Keith Uplinger 7c9b4ad223 Fixed bug where new email address and change time was not being passed along to email change function 2018-05-02 09:46:34 -05:00
Keith Uplinger 93d6e0bda9 Clean up boinc_db email calls.
Moved edit_email_action to fix time of email change not being passed to next function.

Added check for previous email address still within 7 days for create_account.php call.
2018-05-02 09:45:40 -05:00
Keith Uplinger 7916631a85 Fix setting previous email address in AccountManager set info. 2018-05-01 22:26:03 -05:00
Keith Uplinger aaf866ebb0 Delete token for email recovery. 2018-05-01 21:30:50 -05:00
Kevin Reed e821de2643 web: add logic to insert into user_deleted and host_deleted when
deleting a user
2018-05-01 17:08:29 -05:00
Kevin Reed 22adf5878c
Merge pull request #2330 from alexander255/master
Android: Make build scripts more reliable
2018-05-01 14:48:55 -05:00
Kevin Reed 762c052315
Merge pull request #2487 from BOINC/dpa_util
move random_string() and dtime() from util.inc to util_basic.inc
2018-05-01 14:02:44 -05:00
Kevin Reed aaaae625a6
Merge pull request #2488 from BOINC/dpa_preview
web: show title in thread preview
2018-05-01 13:58:22 -05:00
Kevin Reed d84bd9c6a0
Merge pull request #2497 from BOINC/dpa_admin
web: change names of admin functions to e.g. admin_show_user()
2018-05-01 13:55:26 -05:00
Keith Uplinger 3011ccf8db Fixed a typo in recover_email.php as well as not require the user to be logged in when trying to reset email address. 2018-05-01 12:51:27 -05:00
David Anderson 5914060d4b web: change names of admin functions to e.g. admin_show_user()
to avoid conflict with non-admin versions
2018-05-01 10:47:38 -07:00