Browse code

[security] Add no_log to several module args (CVE-2021-20191) [2.8] (#73488)

Change:
- A number of modules were missing no_log=True where they should have
had it.

Test Plan:
- Lots of grepping.

Tickets:
- Refs https://github.com/ansible-collections/community.general/pull/1725

Signed-off-by: Rick Elrod <rick@elrod.me>

Rick Elrod authored on 2021/02/05 09:06:39
Showing 35 changed files
1 1
new file mode 100644
... ...
@@ -0,0 +1,45 @@
0
+security_fixes:
1
+  - _sf_account_manager - `initiator_secret` is now masked with no_log and no longer emitted in logging/output (CVE-2021-20191).
2
+  - _sf_account_manager - `target_secret` is now masked with no_log and no longer emitted in logging/output (CVE-2021-20191).
3
+  - ce_vrrp - `auth_key` is now masked with no_log and no longer emitted in logging/output (CVE-2021-20191).
4
+  - docker_swarm - `signing_ca_key` is now masked with no_log and no longer emitted in logging/output (CVE-2021-20191).
5
+  - gcp_compute_backend_service - `oauth2_client_secret` is now masked with no_log and no longer emitted in logging/output (CVE-2021-20191).
6
+  - gcp_compute_disk - `disk_encryption_key` is now masked with no_log and no longer emitted in logging/output (CVE-2021-20191).
7
+  - gcp_compute_disk - `source_image_encryption_key` is now masked with no_log and no longer emitted in logging/output (CVE-2021-20191).
8
+  - gcp_compute_disk - `source_snapshot_encryption_key` is now masked with no_log and no longer emitted in logging/output (CVE-2021-20191).
9
+  - gcp_compute_image - `image_encryption_key` is now masked with no_log and no longer emitted in logging/output (CVE-2021-20191).
10
+  - gcp_compute_image - `source_disk_encryption_key` is now masked with no_log and no longer emitted in logging/output (CVE-2021-20191).
11
+  - gcp_compute_instance_template - `disk_encryption_key` is now masked with no_log and no longer emitted in logging/output (CVE-2021-20191).
12
+  - gcp_compute_instance_template - `source_image_encryption_key` is now masked with no_log and no longer emitted in logging/output (CVE-2021-20191).
13
+  - gcp_compute_region_disk - `disk_encryption_key` is now masked with no_log and no longer emitted in logging/output (CVE-2021-20191).
14
+  - gcp_compute_region_disk - `source_snapshot_encryption_key` is now masked with no_log and no longer emitted in logging/output (CVE-2021-20191).
15
+  - gcp_compute_ssl_certificate - `private_key` is now masked with no_log and no longer emitted in logging/output (CVE-2021-20191).
16
+  - gcp_compute_vpn_tunnel - `shared_secret` is now masked with no_log and no longer emitted in logging/output (CVE-2021-20191).
17
+  - gcp_sql_instance - `client_key` is now masked with no_log and no longer emitted in logging/output (CVE-2021-20191).
18
+  - gitlab_runner - `registration_token` is now masked with no_log and no longer emitted in logging/output (CVE-2021-20191).
19
+  - iap_start_workflow - `token_key` is now masked with no_log and no longer emitted in logging/output (CVE-2021-20191).
20
+  - ibm_sa_host - `iscsi_chap_secret` is now masked with no_log and no longer emitted in logging/output (CVE-2021-20191).
21
+  - keycloak_client - `auth_client_secret` is now masked with no_log and no longer emitted in logging/output (CVE-2021-20191).
22
+  - keycloak_clienttemplate - `auth_client_secret` is now masked with no_log and no longer emitted in logging/output (CVE-2021-20191).
23
+  - keycloak_group - `auth_client_secret` is now masked with no_log and no longer emitted in logging/output (CVE-2021-20191).
24
+  - librato_annotation - `api_key` is now masked with no_log and no longer emitted in logging/output (CVE-2021-20191).
25
+  - na_elementsw_account - `initiator_secret` is now masked with no_log and no longer emitted in logging/output (CVE-2021-20191).
26
+  - na_elementsw_account - `target_secret` is now masked with no_log and no longer emitted in logging/output (CVE-2021-20191).
27
+  - netscaler_lb_monitor - `radkey` is now masked with no_log and no longer emitted in logging/output (CVE-2021-20191).
28
+  - nios_nsgroup - `tsig_key` is now masked with no_log and no longer emitted in logging/output (CVE-2021-20191).
29
+  - nxos_aaa_server - `global_key` is now masked with no_log and no longer emitted in logging/output (CVE-2021-20191).
30
+  - nxos_pim_interface - `hello_auth_key` is now masked with no_log and no longer emitted in logging/output (CVE-2021-20191).
31
+  - oneandone_firewall_policy - `auth_token` is now masked with no_log and no longer emitted in logging/output (CVE-2021-20191).
32
+  - oneandone_load_balancer - `auth_token` is now masked with no_log and no longer emitted in logging/output (CVE-2021-20191).
33
+  - oneandone_monitoring_policy - `auth_token` is now masked with no_log and no longer emitted in logging/output (CVE-2021-20191).
34
+  - oneandone_private_network - `auth_token` is now masked with no_log and no longer emitted in logging/output (CVE-2021-20191).
35
+  - oneandone_public_ip - `auth_token` is now masked with no_log and no longer emitted in logging/output (CVE-2021-20191).
36
+  - ovirt - `instance_rootpw` is now masked with no_log and no longer emitted in logging/output (CVE-2021-20191).
37
+  - pagerduty_alert - `api_key` is now masked with no_log and no longer emitted in logging/output (CVE-2021-20191).
38
+  - pagerduty_alert - `integration_key` is now masked with no_log and no longer emitted in logging/output (CVE-2021-20191).
39
+  - pagerduty_alert - `service_key` is now masked with no_log and no longer emitted in logging/output (CVE-2021-20191).
40
+  - pulp_repo - `feed_client_key` is now masked with no_log and no longer emitted in logging/output (CVE-2021-20191).
41
+  - rax_clb_ssl - `private_key` is now masked with no_log and no longer emitted in logging/output (CVE-2021-20191).
42
+  - spotinst_aws_elastigroup - `multai_token` is now masked with no_log and no longer emitted in logging/output (CVE-2021-20191).
43
+  - spotinst_aws_elastigroup - `token` is now masked with no_log and no longer emitted in logging/output (CVE-2021-20191).
44
+  - utm_proxy_auth_profile - `frontend_cookie_secret` is now masked with no_log and no longer emitted in logging/output (CVE-2021-20191).
... ...
@@ -57,7 +57,7 @@ def keycloak_argument_spec():
57 57
         auth_keycloak_url=dict(type='str', aliases=['url'], required=True),
58 58
         auth_client_id=dict(type='str', default='admin-cli'),
59 59
         auth_realm=dict(type='str', required=True),
60
-        auth_client_secret=dict(type='str', default=None),
60
+        auth_client_secret=dict(type='str', default=None, no_log=True),
61 61
         auth_username=dict(type='str', aliases=['username'], required=True),
62 62
         auth_password=dict(type='str', aliases=['password'], required=True, no_log=True),
63 63
         validate_certs=dict(type='bool', default=True)
... ...
@@ -620,7 +620,7 @@ def main():
620 620
         name=dict(type='str'),
621 621
         labels=dict(type='dict'),
622 622
         signing_ca_cert=dict(type='str'),
623
-        signing_ca_key=dict(type='str'),
623
+        signing_ca_key=dict(type='str', no_log=True),
624 624
         ca_force_rotate=dict(type='int'),
625 625
         autolock_managers=dict(type='bool'),
626 626
         node_id=dict(type='str'),
... ...
@@ -686,7 +686,11 @@ def main():
686 686
             health_checks=dict(required=True, type='list', elements='str'),
687 687
             iap=dict(
688 688
                 type='dict',
689
-                options=dict(enabled=dict(type='bool'), oauth2_client_id=dict(required=True, type='str'), oauth2_client_secret=dict(required=True, type='str')),
689
+                options=dict(
690
+                    enabled=dict(type='bool'),
691
+                    oauth2_client_id=dict(required=True, type='str'),
692
+                    oauth2_client_secret=dict(required=True, type='str', no_log=True),
693
+                ),
690 694
             ),
691 695
             load_balancing_scheme=dict(default='EXTERNAL', type='str', choices=['INTERNAL', 'EXTERNAL']),
692 696
             name=dict(required=True, type='str'),
... ...
@@ -440,10 +440,10 @@ def main():
440 440
             type=dict(type='str'),
441 441
             source_image=dict(type='str'),
442 442
             zone=dict(required=True, type='str'),
443
-            source_image_encryption_key=dict(type='dict', options=dict(raw_key=dict(type='str'), kms_key_name=dict(type='str'))),
444
-            disk_encryption_key=dict(type='dict', options=dict(raw_key=dict(type='str'), kms_key_name=dict(type='str'))),
443
+            source_image_encryption_key=dict(type='dict', options=dict(raw_key=dict(type='str', no_log=True), kms_key_name=dict(type='str'))),
444
+            disk_encryption_key=dict(type='dict', options=dict(raw_key=dict(type='str', no_log=True), kms_key_name=dict(type='str'))),
445 445
             source_snapshot=dict(type='dict'),
446
-            source_snapshot_encryption_key=dict(type='dict', options=dict(raw_key=dict(type='str'), kms_key_name=dict(type='str'))),
446
+            source_snapshot_encryption_key=dict(type='dict', options=dict(raw_key=dict(type='str', no_log=True), kms_key_name=dict(type='str'))),
447 447
         )
448 448
     )
449 449
 
... ...
@@ -444,7 +444,7 @@ def main():
444 444
             disk_size_gb=dict(type='int'),
445 445
             family=dict(type='str'),
446 446
             guest_os_features=dict(type='list', elements='dict', options=dict(type=dict(type='str', choices=['VIRTIO_SCSI_MULTIQUEUE']))),
447
-            image_encryption_key=dict(type='dict', options=dict(raw_key=dict(type='str'))),
447
+            image_encryption_key=dict(type='dict', options=dict(raw_key=dict(type='str', no_log=True))),
448 448
             labels=dict(type='dict'),
449 449
             licenses=dict(type='list', elements='str'),
450 450
             name=dict(required=True, type='str'),
... ...
@@ -453,7 +453,7 @@ def main():
453 453
                 options=dict(container_type=dict(type='str', choices=['TAR']), sha1_checksum=dict(type='str'), source=dict(required=True, type='str')),
454 454
             ),
455 455
             source_disk=dict(type='dict'),
456
-            source_disk_encryption_key=dict(type='dict', options=dict(raw_key=dict(type='str'))),
456
+            source_disk_encryption_key=dict(type='dict', options=dict(raw_key=dict(type='str', no_log=True))),
457 457
             source_disk_id=dict(type='str'),
458 458
             source_type=dict(type='str', choices=['RAW']),
459 459
         )
... ...
@@ -863,7 +863,13 @@ def main():
863 863
                             auto_delete=dict(type='bool'),
864 864
                             boot=dict(type='bool'),
865 865
                             device_name=dict(type='str'),
866
-                            disk_encryption_key=dict(type='dict', options=dict(raw_key=dict(type='str'), rsa_encrypted_key=dict(type='str'))),
866
+                            disk_encryption_key=dict(
867
+                                type='dict',
868
+                                options=dict(
869
+                                    raw_key=dict(type='str', no_log=True),
870
+                                    rsa_encrypted_key=dict(type='str', no_log=True),
871
+                                ),
872
+                            ),
867 873
                             index=dict(type='int'),
868 874
                             initialize_params=dict(
869 875
                                 type='dict',
... ...
@@ -872,7 +878,7 @@ def main():
872 872
                                     disk_size_gb=dict(type='int'),
873 873
                                     disk_type=dict(type='str'),
874 874
                                     source_image=dict(type='str'),
875
-                                    source_image_encryption_key=dict(type='dict', options=dict(raw_key=dict(type='str'))),
875
+                                    source_image_encryption_key=dict(type='dict', options=dict(raw_key=dict(type='str', no_log=True))),
876 876
                                 ),
877 877
                             ),
878 878
                             interface=dict(type='str', choices=['SCSI', 'NVME']),
... ...
@@ -354,9 +354,9 @@ def main():
354 354
             replica_zones=dict(required=True, type='list', elements='str'),
355 355
             type=dict(type='str'),
356 356
             region=dict(required=True, type='str'),
357
-            disk_encryption_key=dict(type='dict', options=dict(raw_key=dict(type='str'))),
357
+            disk_encryption_key=dict(type='dict', options=dict(raw_key=dict(type='str', no_log=True))),
358 358
             source_snapshot=dict(type='dict'),
359
-            source_snapshot_encryption_key=dict(type='dict', options=dict(raw_key=dict(type='str'))),
359
+            source_snapshot_encryption_key=dict(type='dict', options=dict(raw_key=dict(type='str', no_log=True))),
360 360
         )
361 361
     )
362 362
 
... ...
@@ -163,7 +163,7 @@ def main():
163 163
             certificate=dict(required=True, type='str'),
164 164
             description=dict(type='str'),
165 165
             name=dict(type='str'),
166
-            private_key=dict(required=True, type='str'),
166
+            private_key=dict(required=True, type='str', no_log=True),
167 167
         )
168 168
     )
169 169
 
... ...
@@ -269,7 +269,7 @@ def main():
269 269
             target_vpn_gateway=dict(required=True, type='dict'),
270 270
             router=dict(type='dict'),
271 271
             peer_ip=dict(required=True, type='str'),
272
-            shared_secret=dict(required=True, type='str'),
272
+            shared_secret=dict(required=True, type='str', no_log=True),
273 273
             ike_version=dict(default=2, type='int'),
274 274
             local_traffic_selector=dict(type='list', elements='str'),
275 275
             remote_traffic_selector=dict(type='list', elements='str'),
... ...
@@ -626,7 +626,7 @@ def main():
626 626
                         options=dict(
627 627
                             ca_certificate=dict(type='str'),
628 628
                             client_certificate=dict(type='str'),
629
-                            client_key=dict(type='str'),
629
+                            client_key=dict(type='str', no_log=True),
630 630
                             connect_retry_interval=dict(type='int'),
631 631
                             dump_file_path=dict(type='str'),
632 632
                             master_heartbeat_period=dict(type='int'),
... ...
@@ -380,7 +380,7 @@ def main():
380 380
             instance_gateway=dict(type='str', aliases=['gateway']),
381 381
             instance_domain=dict(type='str', aliases=['domain']),
382 382
             instance_dns=dict(type='str', aliases=['dns']),
383
-            instance_rootpw=dict(type='str', aliases=['rootpw']),
383
+            instance_rootpw=dict(type='str', aliases=['rootpw'], no_log=True),
384 384
             instance_key=dict(type='str', aliases=['key']),
385 385
             sdomain=dict(type='str'),
386 386
             region=dict(type='str'),
... ...
@@ -504,7 +504,8 @@ def main():
504 504
         argument_spec=dict(
505 505
             auth_token=dict(
506 506
                 type='str',
507
-                default=os.environ.get('ONEANDONE_AUTH_TOKEN')),
507
+                default=os.environ.get('ONEANDONE_AUTH_TOKEN'),
508
+                no_log=True),
508 509
             api_url=dict(
509 510
                 type='str',
510 511
                 default=os.environ.get('ONEANDONE_API_URL')),
... ...
@@ -595,7 +595,8 @@ def main():
595 595
         argument_spec=dict(
596 596
             auth_token=dict(
597 597
                 type='str',
598
-                default=os.environ.get('ONEANDONE_AUTH_TOKEN')),
598
+                default=os.environ.get('ONEANDONE_AUTH_TOKEN'),
599
+                no_log=True),
599 600
             api_url=dict(
600 601
                 type='str',
601 602
                 default=os.environ.get('ONEANDONE_API_URL')),
... ...
@@ -950,7 +950,8 @@ def main():
950 950
         argument_spec=dict(
951 951
             auth_token=dict(
952 952
                 type='str',
953
-                default=os.environ.get('ONEANDONE_AUTH_TOKEN')),
953
+                default=os.environ.get('ONEANDONE_AUTH_TOKEN'),
954
+                no_log=True),
954 955
             api_url=dict(
955 956
                 type='str',
956 957
                 default=os.environ.get('ONEANDONE_API_URL')),
... ...
@@ -384,7 +384,8 @@ def main():
384 384
         argument_spec=dict(
385 385
             auth_token=dict(
386 386
                 type='str',
387
-                default=os.environ.get('ONEANDONE_AUTH_TOKEN')),
387
+                default=os.environ.get('ONEANDONE_AUTH_TOKEN'),
388
+                no_log=True),
388 389
             api_url=dict(
389 390
                 type='str',
390 391
                 default=os.environ.get('ONEANDONE_API_URL')),
... ...
@@ -277,7 +277,8 @@ def main():
277 277
         argument_spec=dict(
278 278
             auth_token=dict(
279 279
                 type='str',
280
-                default=os.environ.get('ONEANDONE_AUTH_TOKEN')),
280
+                default=os.environ.get('ONEANDONE_AUTH_TOKEN'),
281
+                no_log=True),
281 282
             api_url=dict(
282 283
                 type='str',
283 284
                 default=os.environ.get('ONEANDONE_API_URL')),
... ...
@@ -236,7 +236,7 @@ def main():
236 236
         loadbalancer=dict(required=True),
237 237
         state=dict(default='present', choices=['present', 'absent']),
238 238
         enabled=dict(type='bool', default=True),
239
-        private_key=dict(),
239
+        private_key=dict(no_log=True),
240 240
         certificate=dict(),
241 241
         intermediate_certificate=dict(),
242 242
         secure_port=dict(type='int', default=443),
... ...
@@ -1438,7 +1438,7 @@ def main():
1438 1438
         min_size=dict(type='int', required=True),
1439 1439
         monitoring=dict(type='str'),
1440 1440
         multai_load_balancers=dict(type='list'),
1441
-        multai_token=dict(type='str'),
1441
+        multai_token=dict(type='str', no_log=True),
1442 1442
         name=dict(type='str', required=True),
1443 1443
         network_interfaces=dict(type='list'),
1444 1444
         on_demand_count=dict(type='int'),
... ...
@@ -1462,7 +1462,7 @@ def main():
1462 1462
         target_group_arns=dict(type='list'),
1463 1463
         tenancy=dict(type='str'),
1464 1464
         terminate_at_end_of_billing_hour=dict(type='bool'),
1465
-        token=dict(type='str'),
1465
+        token=dict(type='str', no_log=True),
1466 1466
         unit=dict(type='str'),
1467 1467
         user_data=dict(type='str'),
1468 1468
         utilize_reserved_instances=dict(type='bool'),
... ...
@@ -146,7 +146,7 @@ def main():
146 146
     module = AnsibleModule(
147 147
         argument_spec=dict(
148 148
             user=dict(required=True),
149
-            api_key=dict(required=True),
149
+            api_key=dict(required=True, no_log=True),
150 150
             name=dict(required=False),
151 151
             title=dict(required=True),
152 152
             source=dict(required=False),
... ...
@@ -190,9 +190,9 @@ def main():
190 190
         argument_spec=dict(
191 191
             name=dict(required=False),
192 192
             service_id=dict(required=True),
193
-            service_key=dict(require=False),
194
-            integration_key=dict(require=False),
195
-            api_key=dict(required=True),
193
+            service_key=dict(required=False, no_log=True),
194
+            integration_key=dict(required=False, no_log=True),
195
+            api_key=dict(required=True, no_log=True),
196 196
             state=dict(required=True,
197 197
                        choices=['triggered', 'acknowledged', 'resolved']),
198 198
             client=dict(required=False, default=None),
... ...
@@ -305,7 +305,7 @@ def main():
305 305
         address=dict(required=True, ib_req=True),
306 306
         name=dict(required=True, ib_req=True),
307 307
         stealth=dict(type='bool', default=False),
308
-        tsig_key=dict(),
308
+        tsig_key=dict(no_log=True),
309 309
         tsig_key_alg=dict(choices=['HMAC-MD5', 'HMAC-SHA256'], default='HMAC-MD5'),
310 310
         tsig_key_name=dict(required=True)
311 311
     )
... ...
@@ -1316,7 +1316,7 @@ def main():
1316 1316
         holding_multiplier=dict(type='str'),
1317 1317
         auth_mode=dict(type='str', choices=['simple', 'md5', 'none']),
1318 1318
         is_plain=dict(type='bool', default=False),
1319
-        auth_key=dict(type='str'),
1319
+        auth_key=dict(type='str', no_log=True),
1320 1320
         fast_resume=dict(type='str', choices=['enable', 'disable']),
1321 1321
         state=dict(type='str', default='present',
1322 1322
                    choices=['present', 'absent'])
... ...
@@ -169,7 +169,7 @@ def main():
169 169
         argument_spec=dict(
170 170
             iap_port=dict(type='str', required=True),
171 171
             iap_fqdn=dict(type='str', required=True),
172
-            token_key=dict(type='str', required=True),
172
+            token_key=dict(type='str', required=True, no_log=True),
173 173
             workflow_name=dict(type='str', required=True),
174 174
             description=dict(type='str', required=True),
175 175
             variables=dict(type='dict', required=False),
... ...
@@ -986,7 +986,7 @@ def main():
986 986
         secondarypassword=dict(type='str'),
987 987
         logonpointname=dict(type='str'),
988 988
         lasversion=dict(type='str'),
989
-        radkey=dict(type='str'),
989
+        radkey=dict(type='str', no_log=True),
990 990
         radnasid=dict(type='str'),
991 991
         radnasip=dict(type='str'),
992 992
         radaccounttype=dict(type='float'),
... ...
@@ -234,7 +234,7 @@ def default_aaa_server(existing, params, server_type):
234 234
 def main():
235 235
     argument_spec = dict(
236 236
         server_type=dict(type='str', choices=['radius', 'tacacs'], required=True),
237
-        global_key=dict(type='str'),
237
+        global_key=dict(type='str', no_log=True),
238 238
         encrypt_type=dict(type='str', choices=['0', '7']),
239 239
         deadtime=dict(type='str'),
240 240
         server_timeout=dict(type='str'),
... ...
@@ -435,7 +435,7 @@ def main():
435 435
         interface=dict(type='str', required=True),
436 436
         sparse=dict(type='bool', default=False),
437 437
         dr_prio=dict(type='str'),
438
-        hello_auth_key=dict(type='str'),
438
+        hello_auth_key=dict(type='str', no_log=True),
439 439
         hello_interval=dict(type='int'),
440 440
         jp_policy_out=dict(type='str'),
441 441
         jp_policy_in=dict(type='str'),
... ...
@@ -293,7 +293,7 @@ def main():
293 293
     argument_spec = dict(
294 294
         user=dict(required=True, type='str'),
295 295
         group=dict(type='str'),
296
-        pwd=dict(type='str'),
296
+        pwd=dict(type='str', no_log=True),
297 297
         privacy=dict(type='str'),
298 298
         authentication=dict(choices=['md5', 'sha']),
299 299
         encrypt=dict(type='bool'),
... ...
@@ -330,7 +330,7 @@ def main():
330 330
         admin_state=dict(required=False, type='str',
331 331
                          choices=['shutdown', 'no shutdown', 'default'],
332 332
                          default='shutdown'),
333
-        authentication=dict(required=False, type='str'),
333
+        authentication=dict(required=False, type='str', no_log=True),
334 334
         state=dict(choices=['absent', 'present'], required=False, default='present')
335 335
     )
336 336
     argument_spec.update(nxos_argument_spec)
... ...
@@ -537,7 +537,7 @@ def main():
537 537
         generate_sqlite=dict(default=False, type='bool'),
538 538
         ca_cert=dict(aliases=['importer_ssl_ca_cert']),
539 539
         client_cert=dict(aliases=['importer_ssl_client_cert']),
540
-        client_key=dict(aliases=['importer_ssl_client_key']),
540
+        client_key=dict(aliases=['importer_ssl_client_key'], no_log=True),
541 541
         name=dict(required=True, aliases=['repo']),
542 542
         proxy_host=dict(),
543 543
         proxy_port=dict(),
... ...
@@ -304,7 +304,7 @@ def main():
304 304
         locked=dict(type='bool', default=False),
305 305
         access_level=dict(type='str', default='ref_protected', choices=["not_protected", "ref_protected"]),
306 306
         maximum_timeout=dict(type='int', default=3600),
307
-        registration_token=dict(type='str', required=True),
307
+        registration_token=dict(type='str', required=True, no_log=True),
308 308
         state=dict(type='str', default="present", choices=["absent", "present"]),
309 309
     ))
310 310
 
... ...
@@ -95,7 +95,7 @@ def main():
95 95
             cluster=dict(),
96 96
             domain=dict(),
97 97
             iscsi_chap_name=dict(),
98
-            iscsi_chap_secret=dict()
98
+            iscsi_chap_secret=dict(no_log=True)
99 99
         )
100 100
     )
101 101
 
... ...
@@ -120,8 +120,8 @@ class SolidFireAccount(object):
120 120
             account_id=dict(required=False, type='int', default=None),
121 121
 
122 122
             new_name=dict(required=False, type='str', default=None),
123
-            initiator_secret=dict(required=False, type='str'),
124
-            target_secret=dict(required=False, type='str'),
123
+            initiator_secret=dict(required=False, type='str', no_log=True),
124
+            target_secret=dict(required=False, type='str', no_log=True),
125 125
             attributes=dict(required=False, type='dict'),
126 126
             status=dict(required=False, type='str'),
127 127
         ))
... ...
@@ -142,8 +142,8 @@ class ElementSWAccount(object):
142 142
             state=dict(required=True, choices=['present', 'absent']),
143 143
             element_username=dict(required=True, aliases=["account_id"], type='str'),
144 144
             from_name=dict(required=False, default=None),
145
-            initiator_secret=dict(required=False, type='str'),
146
-            target_secret=dict(required=False, type='str'),
145
+            initiator_secret=dict(required=False, type='str', no_log=True),
146
+            target_secret=dict(required=False, type='str', no_log=True),
147 147
             attributes=dict(required=False, type='dict'),
148 148
             status=dict(required=False, type='str'),
149 149
         ))
... ...
@@ -319,7 +319,7 @@ def main():
319 319
             backend_user_suffix=dict(type='str', required=False, default=""),
320 320
             comment=dict(type='str', required=False, default=""),
321 321
             frontend_cookie=dict(type='str', required=False),
322
-            frontend_cookie_secret=dict(type='str', required=False),
322
+            frontend_cookie_secret=dict(type='str', required=False, no_log=True),
323 323
             frontend_form=dict(type='str', required=False),
324 324
             frontend_form_template=dict(type='str', required=False, default=""),
325 325
             frontend_login=dict(type='str', required=False),