From 007863e05cb22ff5a7c428df3d8bd30857f65869 Mon Sep 17 00:00:00 2001
From: thomashaw <thomashaw@gmail.com>
Date: Thu, 8 Dec 2016 10:54:21 +0000
Subject: [PATCH] weak_password_generator <type> added to the weak and common
 pw gens, fixed typo in account_hash_builder

---
 .../account/account_hash_builder/secgen_metadata.xml         | 2 +-
 .../random/random_common_password/secgen_metadata.xml        | 1 +
 .../random/random_weak_password/secgen_metadata.xml          | 1 +
 .../unix/system/parameterised_accounts/secgen_metadata.xml   | 5 ++---
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/encoders/account/account_hash_builder/secgen_metadata.xml b/modules/encoders/account/account_hash_builder/secgen_metadata.xml
index 864b98b8a..eb4b6dc2b 100644
--- a/modules/encoders/account/account_hash_builder/secgen_metadata.xml
+++ b/modules/encoders/account/account_hash_builder/secgen_metadata.xml
@@ -17,7 +17,7 @@
   <read_fact>password</read_fact>
   <read_fact>super_user</read_fact>
   <read_fact>strings_to_leak</read_fact>
-  <read_fact>leaked_filename</read_fact>
+  <read_fact>leaked_filenames</read_fact>
 
   <!-- TODO: This encoder should have default values so that we can omit a default input -->
 
diff --git a/modules/generators/random/random_common_password/secgen_metadata.xml b/modules/generators/random/random_common_password/secgen_metadata.xml
index 5a0e4f32b..5cbf3d22d 100644
--- a/modules/generators/random/random_common_password/secgen_metadata.xml
+++ b/modules/generators/random/random_common_password/secgen_metadata.xml
@@ -11,6 +11,7 @@
   </description>
 
   <type>password_generator</type>
+  <type>weak_password_generator</type>
   <type>local_calculation</type>
   <platform>linux</platform>
   <platform>windows</platform>
diff --git a/modules/generators/random/random_weak_password/secgen_metadata.xml b/modules/generators/random/random_weak_password/secgen_metadata.xml
index 553c19f55..8e3e2d0b3 100644
--- a/modules/generators/random/random_weak_password/secgen_metadata.xml
+++ b/modules/generators/random/random_weak_password/secgen_metadata.xml
@@ -9,6 +9,7 @@
   <description>Selects a random dictionary word or english name between 3 and 6 characters long. </description>
 
   <type>password_generator</type>
+  <type>weak_password_generator</type>
   <type>local_calculation</type>
   <platform>linux</platform>
   <platform>windows</platform>
diff --git a/modules/vulnerabilities/unix/system/parameterised_accounts/secgen_metadata.xml b/modules/vulnerabilities/unix/system/parameterised_accounts/secgen_metadata.xml
index 54cc115e4..d6336fd81 100644
--- a/modules/vulnerabilities/unix/system/parameterised_accounts/secgen_metadata.xml
+++ b/modules/vulnerabilities/unix/system/parameterised_accounts/secgen_metadata.xml
@@ -15,7 +15,6 @@
   <platform>linux</platform>
 
   <read_fact>accounts</read_fact>
-  <read_fact>strings_to_leak</read_fact>
 
   <default_input into="accounts">
     <encoder type="account">
@@ -23,10 +22,10 @@
         <generator type="username_generator"/>
       </input>
       <input into="password">
-        <generator type="password_generator"/>
+        <generator type="weak_password_generator"/>
       </input>
       <input into="super_user">
-        <generator type="boolean_generator"/>
+        <value>false</value>
       </input>
       <input into="strings_to_leak">
         <generator type="message_generator"/>