Skip to content

Commit d59a902

Browse files
authoredFeb 2, 2019
Merge pull request #67 from atishgoswami/bugfix/issue#62
Addes fixes for app:config:dump exporting sensitive information
2 parents d3ff8e9 + 49e96f8 commit d59a902

File tree

3 files changed

+18
-2
lines changed

3 files changed

+18
-2
lines changed
 

‎etc/adminhtml/system.xml

+4-2
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,13 @@
1010
<resource>Thai_S3::config_s3</resource>
1111
<group id="general" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
1212
<label>General</label>
13-
<field id="access_key" type="text" showInDefault="1" showInWebsite="1" showInStore="1">
13+
<field id="access_key" type="obscure" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
1414
<label>Access Key</label>
15+
<backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
1516
</field>
16-
<field id="secret_key" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
17+
<field id="secret_key" type="obscure" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
1718
<label>Secret Key</label>
19+
<backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
1820
</field>
1921
<field id="bucket" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
2022
<label>Bucket</label>

‎etc/config.xml

+6
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
33
<default>
44
<system>
5+
<thai_s3>
6+
<general>
7+
<access_key backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
8+
<secret_key backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
9+
</general>
10+
</thai_s3>
511
<media_storage_configuration>
612
<allowed_resources>
713
<attribute_image_folder>attribute</attribute_image_folder>

‎etc/di.xml

+8
Original file line numberDiff line numberDiff line change
@@ -52,4 +52,12 @@
5252
<type name="Magento\Captcha\Model\DefaultModel">
5353
<plugin name="thai_s3_model_captcha_defaultmodel_plugin" type="Thai\S3\Model\Captcha\DefaultModel\Plugin" />
5454
</type>
55+
<type name="Magento\Config\Model\Config\TypePool">
56+
<arguments>
57+
<argument name="sensitive" xsi:type="array">
58+
<item name="thai_s3/general/access_key" xsi:type="string">1</item>
59+
<item name="thai_s3/general/secret_key" xsi:type="string">1</item>
60+
</argument>
61+
</arguments>
62+
</type>
5563
</config>

0 commit comments

Comments
 (0)