Added bash-HTML interpolation & fixed last commit.

Added bash-HTML interpolation of $APTargetSSID, $APTargetMAC, and $APTargetChannel.
> The script will find and replace these tokens if found in portal pages/files.

Fixed a bug introduced in the last commit, where target AP parameters were erroneously populated.
> This was due to the offset caused by adding the signal field, offsetting everything after it.
This commit is contained in:
Matias Barcenas 2017-08-08 21:37:52 -05:00
parent bdf81a4975
commit 1bab965d38
2 changed files with 12 additions and 5 deletions

View File

@ -164,14 +164,21 @@ function captive_portal_set_site() {
case "$site" in
"$DialogOptionCaptivePortalGeneric")
source $FLUXIONPath/attacks/Captive\ Portal/sites/generic/$siteLanguage
captive_portal_generic;;
captive_portal_generic;;
"$general_back")
captive_portal_unset_cert
captive_portal_unset_site
return 1;;
* )
mkdir $FLUXIONWorkspacePath/captive_portal &>$FLUXIONOutputDevice
cp -r $FLUXIONPath/attacks/Captive\ Portal/sites/$sitePath.portal/* $FLUXIONWorkspacePath/captive_portal;;
cp -r $FLUXIONPath/attacks/Captive\ Portal/sites/$sitePath.portal/* \
$FLUXIONWorkspacePath/captive_portal
find $FLUXIONWorkspacePath/captive_portal/ -type f -exec \
sed -i -e 's/$APTargetSSID/'"$APTargetSSID"'/g' {} \;
find $FLUXIONWorkspacePath/captive_portal/ -type f -exec \
sed -i -e 's/$APTargetMAC/'"$APTargetMAC"'/g' {} \;
find $FLUXIONWorkspacePath/captive_portal/ -type f -exec \
sed -i -e 's/$APTargetChannel/'"$APTargetChannel"'/g' {} \;;;
esac
}

View File

@ -750,9 +750,9 @@ function set_target_ap() {
TargetAPCandidatesMAC[@]
APTargetSSID=${IOQueryFormatFields[1]}
APTargetChannel=${IOQueryFormatFields[4]}
APTargetEncryption=${IOQueryFormatFields[5]}
APTargetMAC=${IOQueryFormatFields[6]}
APTargetChannel=${IOQueryFormatFields[5]}
APTargetEncryption=${IOQueryFormatFields[6]}
APTargetMAC=${IOQueryFormatFields[7]}
APTargetMakerID=${APTargetSSID:0:8}
APTargetMaker=$(macchanger -l | grep ${APTargetMakerID,,})
#echo $APTargetSSID $APTargetChannel $APTargetEncryption $APTargetMAC