Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove unencrypted sap client credentials #2217

Merged
Merged
Show file tree
Hide file tree
Changes from 71 commits
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
c0d2965
feat: added encrypted columns for user credentials for SAP config
MueezKhan246 Aug 22, 2024
e9fd79f
refactor: updated build version
MueezKhan246 Aug 22, 2024
64302e4
refactor: added necessary blank space
MueezKhan246 Aug 22, 2024
04c1c29
feat: added migration's file
MueezKhan246 Aug 23, 2024
99e2759
refactor: removed setters and getters for scope of release
MueezKhan246 Aug 23, 2024
c7bffcf
refactor: removed redundant imports
MueezKhan246 Aug 23, 2024
c5d2d2f
feat: added signal for updating encrypted columns
MueezKhan246 Aug 23, 2024
891f85d
refactor: added getters for encrypted credentials
MueezKhan246 Aug 23, 2024
84b3331
refactor: diasabled warning for unused argument
MueezKhan246 Aug 23, 2024
12d07d6
test: added test for setter and getters
MueezKhan246 Aug 23, 2024
8e56778
Merge branch 'master' of github.com:openedx/edx-enterprise into Mueez…
MueezKhan246 Aug 26, 2024
e91eac7
Merge branch 'master' of github.com:openedx/edx-enterprise into Mueez…
MueezKhan246 Aug 26, 2024
240f55e
feat: added data migration to populate encrypted columns
MueezKhan246 Aug 26, 2024
6fa445b
feat: replaced references from unencrypted to encrypted columns
MueezKhan246 Aug 26, 2024
f9b8900
Merge branch 'master' of github.com:openedx/edx-enterprise into Mueez…
MueezKhan246 Aug 26, 2024
b9d1098
refactor: updated build version
MueezKhan246 Aug 26, 2024
fd25199
test: fixing tests failed because of factory error
MueezKhan246 Aug 26, 2024
5ebf636
refactor: removed redundant signal
MueezKhan246 Aug 26, 2024
efd616d
feat: added migration make key nullable to fix failing tests
MueezKhan246 Aug 27, 2024
b0ffbb8
refactor: added necessary blankspace
MueezKhan246 Aug 27, 2024
c689eb2
test: fixed got unexpected keyword arguments "key"
MueezKhan246 Aug 27, 2024
c7bdb1a
test: added test for data migration
MueezKhan246 Aug 27, 2024
341d8c2
test: updated test_populate_decrypted_fields
MueezKhan246 Aug 27, 2024
13a9043
feat: added migration for removing unencrypted client credentials
MueezKhan246 Aug 27, 2024
32bd53a
refactor: update build version
MueezKhan246 Aug 27, 2024
80985f4
refactor: added feature flag for testing api client
MueezKhan246 Aug 28, 2024
135cf85
Merge branch 'MueezKhan/Data-Migration-For-Encrypted-Credentials-Colu…
MueezKhan246 Aug 28, 2024
60cbe4a
refactor: fixed attribute key error
MueezKhan246 Aug 28, 2024
db2b7af
refactor: removing feature flag
MueezKhan246 Aug 28, 2024
2cea266
refactor: kept unencrypted columns in model file
MueezKhan246 Aug 28, 2024
3d00290
refactor: added null=true for unencrypted columns in model
MueezKhan246 Aug 28, 2024
7ff82d9
feat: altered decrypted_secret to be encrypted and made credentials n…
MueezKhan246 Aug 29, 2024
d915377
refactor: updated build version
MueezKhan246 Aug 29, 2024
9e5279f
Merge branch 'MueezKhan/Altering-Client-ID-And-Secret-In-SAP-Configur…
MueezKhan246 Aug 29, 2024
86ad20b
refactor: removed redundant migrations
MueezKhan246 Aug 29, 2024
e65ae31
refactor: removed unencrypted credentials from sap config model
MueezKhan246 Aug 29, 2024
7718973
refactor: updated build version
MueezKhan246 Aug 29, 2024
f8ce96f
Merge branch 'MueezKhan/Removing-Unencrypted-Credentials-From-Model' …
MueezKhan246 Aug 29, 2024
d9436b4
refactor: updated migration dependency
MueezKhan246 Aug 29, 2024
0b7b125
Merge branch 'master' of github.com:openedx/edx-enterprise into Mueez…
MueezKhan246 Aug 30, 2024
abfb873
refactor: updated build version
MueezKhan246 Aug 30, 2024
40ae2b3
feat: removed char field decrypted_secret from code
MueezKhan246 Sep 3, 2024
ae5805c
refactor: update build version
MueezKhan246 Sep 3, 2024
5e74c43
refactor: updated log entry in changelog file
MueezKhan246 Sep 4, 2024
8c9d92f
Merge branch 'MueezKhan/Removing-Decrypted-Client-Secret-In-SAP-Confi…
MueezKhan246 Sep 4, 2024
8d781d7
Merge branch 'master' of github.com:openedx/edx-enterprise into Mueez…
MueezKhan246 Sep 4, 2024
0524bab
refactor: update build version in init file
MueezKhan246 Sep 4, 2024
e4b1b77
Merge branch 'MueezKhan/Removing-Decrypted-Client-Secret-In-SAP-Confi…
MueezKhan246 Sep 4, 2024
0ec1199
feat: added migration file for removing char field decrypted_secret
MueezKhan246 Sep 4, 2024
f200ebe
refactor: updated build version
MueezKhan246 Sep 4, 2024
3bb3b5d
feat: added encrypted client secret for SAP config
MueezKhan246 Sep 4, 2024
b5cc335
refactor: updated build version
MueezKhan246 Sep 4, 2024
0ddfe45
Merge branch 'master' of github.com:openedx/edx-enterprise into Mueez…
MueezKhan246 Sep 6, 2024
d61dbff
refactor: removed redundant trailing whitespace
MueezKhan246 Sep 6, 2024
094bceb
Merge branch 'master' of github.com:openedx/edx-enterprise into Mueez…
MueezKhan246 Sep 6, 2024
4632897
Merge branch 'MueezKhan/Added-Encrypted-Client-Secret-In-SAP-Configur…
MueezKhan246 Sep 6, 2024
b358f88
refactor: removed signal as all references are needed to be removed
MueezKhan246 Sep 6, 2024
e04f50f
refactor: resolved conflicting migrations
MueezKhan246 Sep 6, 2024
c344bdf
Merge branch 'master' of github.com:openedx/edx-enterprise into Mueez…
MueezKhan246 Sep 9, 2024
81671b6
Merge branch 'master' of github.com:openedx/edx-enterprise into Mueez…
MueezKhan246 Sep 9, 2024
850484f
Merge branch 'MueezKhan/Data-Migration-For-Encrypted-Credentials-Colu…
MueezKhan246 Sep 9, 2024
ee0412c
Merge branch 'master' of github.com:openedx/edx-enterprise into Mueez…
MueezKhan246 Sep 9, 2024
7c580e9
Merge branch 'MueezKhan/Removing-Unencrypted-Credentials-From-Model' …
MueezKhan246 Sep 9, 2024
6ad773a
refactor: making unencrypted credentials nullable so after removing r…
MueezKhan246 Sep 9, 2024
82cfbe6
refactor: update build version
MueezKhan246 Sep 9, 2024
b913b3c
Merge branch 'MueezKhan/Making-Unencrypted-SAP-Client-Credentials-Nul…
MueezKhan246 Sep 9, 2024
819f201
Merge branch 'MueezKhan/Removing-Unencrypted-Credentials-From-Model' …
MueezKhan246 Sep 9, 2024
b8c71de
refactor: fixed migrations conflict issue
MueezKhan246 Sep 9, 2024
f46067c
Merge branch 'master' of github.com:openedx/edx-enterprise into Mueez…
MueezKhan246 Sep 10, 2024
b2ea600
Merge branch 'MueezKhan/Making-Unencrypted-SAP-Client-Credentials-Nul…
MueezKhan246 Sep 10, 2024
d2a0a89
Merge branch 'MueezKhan/Removing-Unencrypted-Credentials-From-Model' …
MueezKhan246 Sep 10, 2024
261c873
Merge branch 'master' of github.com:openedx/edx-enterprise into Mueez…
MueezKhan246 Sep 10, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,18 @@ Unreleased
----------
* nothing unreleased

[4.25.8]
----------
* feat: added migration for removing unencrypted client credentials

[4.25.7]
----------
* refactor: removed unencrypted credentials from sap config model.

[4.25.6]
----------
* refactor: making unencrypted credentials nullable so after removing refs tests can run

[4.25.5]
----------
* feat: changing django enterprise customer summary columns
Expand Down
2 changes: 1 addition & 1 deletion enterprise/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
Your project description goes here.
"""

__version__ = "4.25.5"
__version__ = "4.25.8"
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Generated by Django 3.2.23 on 2024-09-09 15:56

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('sap_success_factors', '0022_auto_20240906_1349'),
]

operations = [
migrations.AlterField(
model_name='sapsuccessfactorsenterprisecustomerconfiguration',
name='key',
field=models.CharField(blank=True, default='', help_text='OAuth client identifier.', max_length=255, null=True, verbose_name='Client ID'),
),
migrations.AlterField(
model_name='sapsuccessfactorsenterprisecustomerconfiguration',
name='secret',
field=models.CharField(blank=True, default='', help_text='OAuth client secret.', max_length=255, null=True, verbose_name='Client Secret'),
),
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Generated by Django 3.2.23 on 2024-09-09 16:14

from django.db import migrations


class Migration(migrations.Migration):

dependencies = [
('sap_success_factors', '0023_auto_20240909_1556'),
]

operations = [
migrations.RemoveField(
model_name='sapsuccessfactorsenterprisecustomerconfiguration',
name='key',
),
migrations.RemoveField(
model_name='sapsuccessfactorsenterprisecustomerconfiguration',
name='secret',
),
]
14 changes: 0 additions & 14 deletions integrated_channels/sap_success_factors/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,13 +74,6 @@ class SAPSuccessFactorsEnterpriseCustomerConfiguration(EnterpriseCustomerPluginC
(USER_TYPE_USER, 'User'),
(USER_TYPE_ADMIN, 'Admin'),
)
key = models.CharField(
max_length=255,
blank=True,
default='',
verbose_name="Client ID",
help_text=_("OAuth client identifier.")
)

decrypted_key = EncryptedCharField(
max_length=255,
Expand Down Expand Up @@ -137,13 +130,6 @@ def encrypted_key(self, value):
verbose_name="SAP User ID",
help_text=_("Success factors user identifier.")
)
secret = models.CharField(
max_length=255,
blank=True,
default='',
verbose_name="Client Secret",
help_text=_("OAuth client secret.")
)

decrypted_secret = EncryptedCharField(
max_length=255,
Expand Down