Tim Otten [Tue, 1 Mar 2022 23:07:19 +0000 (15:07 -0800)]
authx_civicrm_enable - Don't enable `Authorization:` headers if there's plausible conflict
Some deployments may have two layers of authorization:
(1) A generic/site-wide HTTP basic check (perhaps to prevent search-engines
from finding the site; perhaps enforced by a reverse proxy)
(2) A Civi or CMS credential (eg session-cookie, ?_authx, or X-Civi-Auth:)
Authx sits in layer 2. It should enable HTTP `Authorization:` handling
if-and-only-if there is NOT a pre-existing `Authorization:` mechanism.
To test this, I enabled the extension over APIv3 REST -- with/without a superfluous header:
```
curl -X POST -d 'entity=Extension&action=enable&json=%7B%22keys%22%3A%22authx%22%7D&api_key=FIXME_USER_KEY&key=FIXME_SITE_KEY' \
'http://dmaster.127.0.0.1.nip.io:8001/sites/all/modules/civicrm/extern/rest.php'
curl -X POST -H 'Authorization: Bearer superfluous' -d 'entity=Extension&action=enable&json=%7B%22keys%22%3A%22authx%22%7D&api_key=FIXME_USER_KEY&key=FIXME_SITE_KEY' \
'http://dmaster.127.0.0.1.nip.io:8001/sites/all/modules/civicrm/extern/rest.php'
```
Tim Otten [Sat, 26 Feb 2022 00:54:28 +0000 (16:54 -0800)]
AllFlowsTest - Make `testJwtMiddleware()` less sensitive to interactions with other tests
Tim Otten [Sat, 26 Feb 2022 00:46:26 +0000 (16:46 -0800)]
AllFlowsTest - If `Authorization:` support is disabled, then it's ignored completely.
This means that the request is effectively anonymous -- the same as it would be if you had not sent an `Authorization:` header.
Tim Otten [Sat, 26 Feb 2022 00:21:29 +0000 (16:21 -0800)]
authx - If `Authorization:` header is disabled, then ignore it.
Tim Otten [Sat, 26 Feb 2022 00:20:55 +0000 (16:20 -0800)]
AllFlowsTest - Add case `testIgnoredHeaderAuthorization()`
Eileen McNaughton [Mon, 25 Apr 2022 21:38:03 +0000 (09:38 +1200)]
Merge pull request #23286 from eileenmcnaughton/mapping
[REF][Test] Update loadMappingTest to use form flow
Eileen McNaughton [Fri, 22 Apr 2022 05:14:00 +0000 (17:14 +1200)]
[REF][Test] Update loadMappingTest to use form flow
This makes it test more accurately what the form is doing....
demeritcowboy [Mon, 25 Apr 2022 16:15:07 +0000 (12:15 -0400)]
Merge pull request #23268 from totten/master-ext-load
dev/core#3184 - Definitively load mainfiles during bootstrap - Option 3
demeritcowboy [Mon, 25 Apr 2022 16:14:51 +0000 (12:14 -0400)]
Merge pull request #21943 from mattwire/gccacheignore
Simplify and improve performance of query to insert updated cache
demeritcowboy [Sun, 24 Apr 2022 19:24:30 +0000 (15:24 -0400)]
Merge pull request #23284 from eileenmcnaughton/import_contact_type
[REF] [Import] Extract getContactType
Eileen McNaughton [Sun, 24 Apr 2022 07:45:08 +0000 (19:45 +1200)]
Merge pull request #23287 from kurund/update-supporter-url
update-supporter-url
demeritcowboy [Fri, 22 Apr 2022 19:37:09 +0000 (15:37 -0400)]
Merge pull request #23285 from eileenmcnaughton/import_old_var
Remove an unset variable
Kurund Jalmi [Fri, 22 Apr 2022 15:50:41 +0000 (16:50 +0100)]
update-supporter-url
demeritcowboy [Fri, 22 Apr 2022 15:45:05 +0000 (11:45 -0400)]
Merge pull request #23147 from braders/contactimage-accept-attr
Restrict allowed uploads - contact image
Eileen McNaughton [Fri, 22 Apr 2022 00:51:14 +0000 (12:51 +1200)]
Remove an unset variable
Eileen McNaughton [Fri, 22 Apr 2022 00:11:17 +0000 (12:11 +1200)]
[REF] [Import] Extract getContactType
Note that the function on the MetaDataTrait is moved to the
Parser_Class - 3 forms use the trait - a unittest class,
the Parser_Class and MapField.
MapField was not calling the old function but the newly added one
clashes - and highlights that the contents of the function
should differ for the 2 scenarios - hence moving
off the Trait and onto the 3 classes that use it
colemanw [Fri, 22 Apr 2022 00:16:38 +0000 (20:16 -0400)]
Merge pull request #23272 from eileenmcnaughton/import_contract
[REF] [Import] Simplify dataSource contract - remove unused preProcess
Eileen McNaughton [Thu, 21 Apr 2022 23:41:18 +0000 (11:41 +1200)]
Merge pull request #23277 from eileenmcnaughton/import_main
Whitespace cleanup in template file
Eileen McNaughton [Thu, 21 Apr 2022 23:27:14 +0000 (11:27 +1200)]
Merge pull request #23278 from demeritcowboy/case-tags-static
Make static function static - processCaseTags
Eileen McNaughton [Thu, 21 Apr 2022 21:01:26 +0000 (09:01 +1200)]
Whitespace cleanup
Eileen McNaughton [Thu, 21 Apr 2022 21:42:31 +0000 (09:42 +1200)]
Merge pull request #23275 from eileenmcnaughton/error
Remove another good intention - unused variables
demeritcowboy [Thu, 21 Apr 2022 21:30:57 +0000 (17:30 -0400)]
Merge pull request #22683 from mattwire/paymentstatushelpersall
dev/financial#141 - Update return parameters on all payment processors to match expected results
demeritcowboy [Thu, 21 Apr 2022 21:20:40 +0000 (17:20 -0400)]
make static static
colemanw [Thu, 21 Apr 2022 20:06:53 +0000 (16:06 -0400)]
Merge pull request #23263 from eileenmcnaughton/import_wippier
[Import] Rename dedupe rule id field from dedupe to dedupe_rule_id field
Eileen McNaughton [Thu, 21 Apr 2022 17:14:15 +0000 (05:14 +1200)]
Remove another good intention - unused variables
100% of the responses from setActiveFields are discarded and 100% of the time
the erroneousField value is not used. Hence it makes sense to remove them....
demeritcowboy [Thu, 21 Apr 2022 19:20:09 +0000 (15:20 -0400)]
Merge pull request #23269 from eileenmcnaughton/email
Remove preferred email format from inline edit
Eileen McNaughton [Thu, 21 Apr 2022 16:31:23 +0000 (04:31 +1200)]
Merge pull request #23274 from civicrm/5.49
5.49 to master
Eileen McNaughton [Thu, 21 Apr 2022 16:31:02 +0000 (04:31 +1200)]
Merge pull request #23271 from colemanw/searchKitTestFix
SearchKit - Fix aggregation issues & test regression
Eileen McNaughton [Thu, 21 Apr 2022 03:06:01 +0000 (15:06 +1200)]
Simplify dataSource contract - remove unused preProcess
The choice of required functions was not great - postProcess passes silly
params & preProcess is never used / always empty - this removes preProcess
and gets rid of the abstract class for postProcess (which
will be decommissioned in a follow up)
Eileen McNaughton [Wed, 20 Apr 2022 10:54:35 +0000 (22:54 +1200)]
[Import] Rename dedupe rule id field from dedupe to dedupe_rule_id field
It is still dedupe internally as those places will 'age out'
Eileen McNaughton [Wed, 20 Apr 2022 06:18:38 +0000 (18:18 +1200)]
[REF] [Import] Clean up on map fields & preview templates in Contact import
This provides a bit of sanity to the MapTable.tpl which is included from
MapField and Preview - the focus being around getting
rid of all the section tags which rely on Count being assigned
and getting back to for-eaching the relevant arrays
Coleman Watts [Thu, 21 Apr 2022 14:07:44 +0000 (10:07 -0400)]
SearchKit - Fix aggregation issues
In the UI, "Extra" fields like Contact.age_years were not being aggregated properly.
On the server, fixes mismatch when checking an aggregate field with a suffix.
Fixes recent test regression.
Eileen McNaughton [Tue, 19 Apr 2022 20:59:23 +0000 (08:59 +1200)]
Use hard-coding when variable is unchangeable
Eileen McNaughton [Thu, 21 Apr 2022 05:20:13 +0000 (17:20 +1200)]
Merge pull request #23245 from eileenmcnaughton/import_wip
Import - start to use civicrm_user_job to track user imports
Eileen McNaughton [Thu, 21 Apr 2022 04:56:52 +0000 (16:56 +1200)]
Merge pull request #23264 from mlutfy/ui47scroll
dev/user-interface#47 Disable scrolling on time inputs
Eileen McNaughton [Thu, 21 Apr 2022 04:56:34 +0000 (16:56 +1200)]
Merge pull request #23267 from civicrm/5.49
5.49 to master
Eileen McNaughton [Thu, 21 Apr 2022 04:55:51 +0000 (16:55 +1200)]
Merge pull request #23265 from colemanw/pivotTablesFix
SearchKit - Fix selection of fields when creating a Data Segment
Eileen McNaughton [Thu, 21 Apr 2022 04:20:45 +0000 (16:20 +1200)]
Remove preferred email format from inline edit
We removed other places in the UI where this shows up....
Tim Otten [Thu, 21 Apr 2022 03:52:09 +0000 (20:52 -0700)]
dev/core#3184 - Definitively load mainfiles during bootstrap
Eileen McNaughton [Thu, 21 Apr 2022 02:52:09 +0000 (14:52 +1200)]
Merge pull request #23266 from colemanw/castToArray
APIv4 - Avoid php error
Coleman Watts [Thu, 21 Apr 2022 00:21:29 +0000 (20:21 -0400)]
APIv4 - Avoid php error
Prevents a php error when calling `array_merge()` on `null`.
Eileen McNaughton [Thu, 21 Apr 2022 00:19:25 +0000 (12:19 +1200)]
Merge pull request #23246 from jmcclelland/CustomCheckboxContributionImport
ensure checkbox custom fields on contributions import properly
Coleman Watts [Wed, 20 Apr 2022 22:41:00 +0000 (18:41 -0400)]
SearchKit - Fix selection of fields when creating a Data Segment
Eileen McNaughton [Wed, 20 Apr 2022 21:51:29 +0000 (09:51 +1200)]
Merge pull request #23059 from colemanw/pivotTables
SearchKit - Add data segmentation functionality
Mathieu Lutfy [Wed, 20 Apr 2022 17:44:02 +0000 (13:44 -0400)]
dev/user-interface#47 Disable scrolling on time inputs
colemanw [Wed, 20 Apr 2022 15:14:28 +0000 (11:14 -0400)]
Merge pull request #23159 from eileenmcnaughton/event
Minor simplification of getAmountLevelText
colemanw [Wed, 20 Apr 2022 15:12:25 +0000 (11:12 -0400)]
Merge pull request #23216 from eileenmcnaughton/import_more
[REF] [Import] Use shared file instead of now-identical files
colemanw [Wed, 20 Apr 2022 15:11:29 +0000 (11:11 -0400)]
Merge pull request #23190 from eileenmcnaughton/pradeep
Start to fix misnamed FinancialTrxn bao
colemanw [Wed, 20 Apr 2022 15:07:01 +0000 (11:07 -0400)]
Merge pull request #23213 from eileenmcnaughton/post
[REF] Do not pass form properties within the form
colemanw [Wed, 20 Apr 2022 15:05:23 +0000 (11:05 -0400)]
Merge pull request #23219 from eileenmcnaughton/import_cust
[REF] [Import] Standardise import text for CustomData import
colemanw [Wed, 20 Apr 2022 15:03:51 +0000 (11:03 -0400)]
Merge pull request #23224 from totten/master-signing-signage
System Check - Add a reminder about CIVICRM_SIGN_KEYS.
colemanw [Wed, 20 Apr 2022 15:02:23 +0000 (11:02 -0400)]
Merge pull request #23185 from eileenmcnaughton/smarty_wiz
Do not escape wizard class - procede straight to Hogwarts
colemanw [Wed, 20 Apr 2022 14:44:38 +0000 (10:44 -0400)]
Merge pull request #23195 from eileenmcnaughton/ds3
[Ref] [Import] [csv] Remove non-functional code
colemanw [Wed, 20 Apr 2022 11:22:43 +0000 (07:22 -0400)]
Merge pull request #23211 from eileenmcnaughton/event1
[REF] Fix test to use form flow / helper
Eileen McNaughton [Tue, 19 Apr 2022 19:30:53 +0000 (07:30 +1200)]
Start to use user_job to track import
Eileen McNaughton [Mon, 18 Apr 2022 04:49:20 +0000 (16:49 +1200)]
Initial permission on UserJob
This adds
1) an acl so only the creator can access and
2) permits anyone with access CiviCRM to GET their
own jobs
3) permission on CREATE is set to administer civicrm
I am thinking that create might be too strict but
it might be better to start this way. Likewise we
probably want sysadmins to be able to access other
people's jobs but unless we have a plan now for
what permissions we want we can punt the question
by keeping these strict for now
Eileen McNaughton [Mon, 18 Apr 2022 04:31:06 +0000 (16:31 +1200)]
[REF] [Import] Strict typing on function that throws an exception if null
Tim Otten [Wed, 20 Apr 2022 04:45:19 +0000 (21:45 -0700)]
Merge pull request #22805 from braders/permission_denied_wordpress_improvement-alternative
WordPress - Display site-theme/decorations on error screens
Eileen McNaughton [Wed, 20 Apr 2022 02:29:37 +0000 (14:29 +1200)]
Merge pull request #23258 from civicrm/5.49
5.49 to master
Tim Otten [Wed, 20 Apr 2022 02:20:45 +0000 (19:20 -0700)]
Merge pull request #23251 from colemanw/managedEntityCleanup
Managed entity cleanup
Tim Otten [Wed, 20 Apr 2022 02:18:20 +0000 (19:18 -0700)]
Merge pull request #23257 from totten/master-error-test
E2E_Core_ErrorTest - Demonstrate whether error pages are well-formed
Seamus Lee [Wed, 20 Apr 2022 01:37:24 +0000 (11:37 +1000)]
Merge pull request #23256 from colemanw/fixDownloadInvoiceButtonPort
Fix dev/core#3168 broken download contribution invoice button
Eileen McNaughton [Wed, 20 Apr 2022 00:55:01 +0000 (12:55 +1200)]
Merge pull request #23164 from mlutfy/eventCancelWaitlist
Event self-service cancel: allow cancelling Waitlist registration
Jamie McClelland [Tue, 19 Apr 2022 13:41:41 +0000 (09:41 -0400)]
ensure checkbox custom fields on contributions import properly
Eileen McNaughton [Wed, 20 Apr 2022 00:07:04 +0000 (12:07 +1200)]
Merge pull request #23247 from colemanw/searchKitAggFix
SearchKit - Prevent errors trying to orderBy nonaggregated columns
Tim Otten [Tue, 19 Apr 2022 22:06:28 +0000 (15:06 -0700)]
E2E_Core_ErrorTest - Demonstrate whether error-pages are well-formed
Coleman Watts [Tue, 19 Apr 2022 22:43:52 +0000 (18:43 -0400)]
Fix dev/core#3168 broken download contribution invoice button
colemanw [Tue, 19 Apr 2022 22:46:59 +0000 (18:46 -0400)]
Merge pull request #23202 from eileenmcnaughton/pay_links
Fix button breakage on viewContribution
colemanw [Tue, 19 Apr 2022 22:41:48 +0000 (18:41 -0400)]
Merge pull request #23253 from eileenmcnaughton/imp_if
[REF] [Import] Obsolete if removal
Eileen McNaughton [Tue, 19 Apr 2022 22:34:56 +0000 (10:34 +1200)]
Merge pull request #23222 from eileenmcnaughton/in_between
[REF] [Import] [Custom] Remove another in-between class
Tim Otten [Tue, 19 Apr 2022 22:02:48 +0000 (15:02 -0700)]
(REF) HttpTestTrait - Promote `assertBodyRegexp()` from `AllFlowsTest` to `HttpTestTrait`
Coleman Watts [Tue, 19 Apr 2022 14:07:13 +0000 (10:07 -0400)]
SearchKit - Prevent errors trying to orderBy nonaggregated columns when using groupBy
Eileen McNaughton [Fri, 15 Apr 2022 04:09:54 +0000 (16:09 +1200)]
Remove another in-between class
A universe search shows no other references
Eileen McNaughton [Mon, 18 Apr 2022 04:31:06 +0000 (16:31 +1200)]
[REF] [Import] Obsolete if removal
This if was left in in the last patch for readability
Coleman Watts [Tue, 19 Apr 2022 18:51:42 +0000 (14:51 -0400)]
ManagedEntities - Refactor class variable $declarations to local variable
demeritcowboy [Tue, 19 Apr 2022 17:40:56 +0000 (13:40 -0400)]
Merge pull request #23183 from eileenmcnaughton/notice
Ensure tags fields are assigned to tpl for email form test
Coleman Watts [Tue, 19 Apr 2022 15:46:41 +0000 (11:46 -0400)]
ManagedEntities - Refactor class variable $plan to local variable
colemanw [Tue, 19 Apr 2022 14:48:08 +0000 (10:48 -0400)]
Merge pull request #23215 from eileenmcnaughton/test_amount
Take a reality check on moneyCleaning in test
colemanw [Tue, 19 Apr 2022 14:46:16 +0000 (10:46 -0400)]
Merge pull request #23237 from eileenmcnaughton/data_source
[REF] [Import] Stop overloading dataSource form
Yashodha Chaku [Tue, 19 Apr 2022 12:40:15 +0000 (18:10 +0530)]
Merge pull request #23235 from eileenmcnaughton/acl
Fix sql error on acl user
Yashodha Chaku [Tue, 19 Apr 2022 12:37:14 +0000 (18:07 +0530)]
Merge pull request #23242 from eileenmcnaughton/imp_var
[REF] [Import] Remove meaningless code
Matthew Wire [Tue, 19 Apr 2022 11:09:11 +0000 (12:09 +0100)]
Merge pull request #23156 from eileenmcnaughton/pppro
Paypal pro, a.net ipn - do not update start date, status
Seamus Lee [Tue, 19 Apr 2022 10:23:14 +0000 (20:23 +1000)]
Merge pull request #22959 from colemanw/managedRefactor
ManagedEntities - Allow targeted reconciliation. Add hook parameter. Simplify logic.
Matthew Wire [Tue, 19 Apr 2022 09:43:54 +0000 (10:43 +0100)]
Merge pull request #23210 from eileenmcnaughton/cancel
Always use cancelSubscription form for cancelling recurring contributions
Tim Otten [Tue, 19 Apr 2022 07:06:43 +0000 (00:06 -0700)]
ManagedEntitiesTest - Add coverage for filtering by module
demeritcowboy [Tue, 19 Apr 2022 03:49:16 +0000 (23:49 -0400)]
Merge pull request #23244 from eileenmcnaughton/wow
I have no words
Eileen McNaughton [Tue, 19 Apr 2022 02:05:19 +0000 (14:05 +1200)]
I have no words
Eileen McNaughton [Tue, 19 Apr 2022 01:39:34 +0000 (13:39 +1200)]
Merge pull request #23241 from eileenmcnaughton/import_abstract
[REF] [Import] remove pointless fini functions.
colemanw [Tue, 19 Apr 2022 00:48:49 +0000 (20:48 -0400)]
Merge pull request #23240 from eileenmcnaughton/import_codes
[REF] [Import] Remove warning count - never returned
Eileen McNaughton [Mon, 18 Apr 2022 23:21:38 +0000 (11:21 +1200)]
[REF] [Import] remove pointless fini functions.
These never do anything - there are there only through copy & paste + a the abstract class requiring them.
In fact all the abstract functions are dumb - the are only called internally
within the classes so I have gotten rid of the abstractness so they
can be removed at will. import makes sense - but the signature doesn't...
Eileen McNaughton [Tue, 19 Apr 2022 00:03:30 +0000 (12:03 +1200)]
Remove meaningless code
Eileen McNaughton [Mon, 18 Apr 2022 23:54:17 +0000 (11:54 +1200)]
Merge pull request #23239 from colemanw/afformLineup
Afform - Improve dragging into dropzones
Tim Otten [Sat, 16 Apr 2022 02:04:06 +0000 (19:04 -0700)]
hook_managed - Accept option module filter
colemanw [Mon, 18 Apr 2022 22:27:30 +0000 (18:27 -0400)]
Merge pull request #23236 from eileenmcnaughton/mapField
[Ref] [Import] Remove another good intention....mapField
Coleman Watts [Thu, 17 Mar 2022 02:00:54 +0000 (22:00 -0400)]
REF - Refactor ManagedEntities with the ability to reconcile a single module
Reconciling a single module (e.g. Afform) is more efficient.
Further refactoring of ManagedEntities for code simplification and efficiency.
Instead of fetching Managed records 3 times (for enabled, disabled and missing modules),
now they are fetched only once and sorted into the correct category.
Eileen McNaughton [Mon, 18 Apr 2022 22:01:19 +0000 (10:01 +1200)]
[REF] [Import] Remove warning count - never returned
Coleman Watts [Mon, 18 Apr 2022 19:42:16 +0000 (15:42 -0400)]
Afform - Improve dragging into dropzones
Eileen McNaughton [Mon, 18 Apr 2022 01:54:32 +0000 (13:54 +1200)]
Stop overloading dataSource form
Coleman Watts [Sun, 17 Apr 2022 18:58:27 +0000 (14:58 -0400)]
SearchKit - Refresh fields after saving a SearchSegment
Coleman Watts [Wed, 30 Mar 2022 23:42:41 +0000 (19:42 -0400)]
SearchKit - Add UI for editing SearchSegments