Skip to content
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
2 changes: 1 addition & 1 deletion manuscript/markdown/main/chapter1.md
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ Keep your eye on the vulnerability advisories, as that is part of what an attack
![](images/ProductBacklog.png)
<!---This is where the images live: https://raw.githubusercontent.com/wiki/binarymist/HolisticInfoSec-For-WebDevelopers/BinaryMist-Approach-To-Threat-Modelling-Assets/BobTheBuilder.jpg-->

Here is where you work through collaboratively creating countermeasure Product Backlog Items (PBIs). Countermeasure PBIs are like any other PBI. PBI qualities:
Here is where you work through collaboratively creating countermeasure **Product Backlog Items (PBIs)**. Countermeasure PBIs are like any other PBI. PBI qualities:
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure why the bold has been added back in? Please undo this.


* Estimable
* Independent
Expand Down
29 changes: 15 additions & 14 deletions manuscript/markdown/main/chapter3.md
Original file line number Diff line number Diff line change
Expand Up @@ -551,10 +551,10 @@ We no longer must run everything as root, so this is no longer an issue.
Port: `8080`

* **ScriptSafe**: I like to be in control of where my JavaScript is coming from
* **Cookies**
* **EditThisCookie**
* **Cookies**: <!---Need some content here--->.
* **EditThisCookie**:<Need some content here>
* **SessionBuddy**: For storage of browser sessions and easy hydration
* **User Agent Switcher for Chrome**
* **User Agent Switcher for Chrome**:<Need some content here>
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was done as per your previous instruction: ba55af9
Also check your email 15/06/2017
No additional content will be added here.

* **Web Developer**: I am a web developer, it has some really useful tools that provide visibility and insight

#### [Iceweasel](https://wiki.debian.org/Iceweasel) (FireFox with different Licensing) add-ons {#tooling-setup-kali-linux-tools-i-use-that-need-adding-to-kali-linux-iceweasel-add-ons}
Expand All @@ -563,7 +563,7 @@ A small introduction to Iceweasel: Iceweasel was forked from Firefox for the pur

* **FoxyProxy Standard**: Similar to the same [Chromium](#tooling-setup-kali-linux-tools-i-use-that-need-adding-to-kali-linux-chromium-extensions-foxyproxy-standard) Extension as discussed above
* **NoScript**: I like to know where my JavaScript is coming from
* **Tamper Data**
* **Tamper Data**:<!---Need some content here--->
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as above.

* **Web Developer**: I'm a web developer, it has some really useful tools that provide visibility and insight
* **HackBar**: HackBar is somewhat useful for (en/de)coding (Base64, Hex, MD5, SHA-(1/256), etc), manipulating and splitting URLs
* **Advanced Cookie Manager**
Expand All @@ -577,6 +577,7 @@ A small introduction to Iceweasel: Iceweasel was forked from Firefox for the pur
%% http://blog.binarymist.net/2014/03/29/up-and-running-with-kali-linux-and-friends/#openVAS

### Additional Hardware {#tooling-setup-kali-linux-additional-hardware}
<!---Need some content here--->
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a heading and subheading. These appear like this in many places in both F0 and F1. We're not changing these.


#### TP-LINK TL-WN722N USB Wireless Adapter

Expand All @@ -588,9 +589,9 @@ As I find it flexible to run pen testing set-ups on VMs, the following addresses

The following is the process I have found to set-up the pass-through on Kali 2016.1 (first Kali rolling release. Kernel 4.3, Gnome 3.18), by-passing the Linux Mint 17.3 (Rosa) Host (in my case).

##### Wi-Fi Adapter:
##### Wi-Fi Adapter

TP-LINK TL-WN722N Version 1.10
TP-LINK TL-WN722N Version 1.10:
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No problem.


* chip-set: Atheros ar9271
* Vendor ID: 0cf3
Expand All @@ -600,7 +601,7 @@ TP-LINK TL-WN722N Version 1.10
![](images/TL-WN722N.jpg)

##### Useful commands:

<!---Please provide a lead-in sentence before Bullet list--->
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't want to add filler text for the sake of it. All I would say is what is already obvious, These are useful commands to be used when setting up the TL-WN722N

* `iwconfig`
* `ifconfig`
* `sudo lshw -C network`
Expand Down Expand Up @@ -644,7 +645,7 @@ First of all, you need to add the user that controls the guest to the vboxusers
##### Provide USB recognition to guest:

Install the appropriate VirtualBox Extension Pack on to the host. These packs can be found here ([https://www.virtualbox.org/wiki/Downloads](https://www.virtualbox.org/wiki/Downloads)) for the most recent,
and older builds here: ([https://www.virtualbox.org/wiki/Download_Old_Builds_5_0](https://www.virtualbox.org/wiki/Download_Old_Builds_5_0)). Do not forget to checksum the pack before you add the extension. The version of the extension pack must match that of the VirtualBox installed. Now in your guest, check to see if you have the appropriate linux-headers package installed. If you do not, run the following:
and older builds here: ([https://www.virtualbox.org/wiki/Download_Old_Builds_5_0](https://www.virtualbox.org/wiki/Download_Old_Builds_5_0)). Do not forget to checksum the pack before you add the extension. The version of the extension pack must match that of the VirtualBox installed. Now in your guest, check to see if you have the appropriate linux-headers package installed. If you do not, run the following commands:

1. `apt-get update`
2. `apt-get upgrade`
Expand All @@ -654,21 +655,21 @@ and older builds here: ([https://www.virtualbox.org/wiki/Download_Old_Builds_5_0
6. Apply extension to VirtualBox in the host at: File -> Preferences -> Extensions.

##### Blacklist Wi-Fi Module on Host:

Unload the `ath9k_htc` module to take effect immediately, and blacklist it so that it does not load on boot. The module needs to be blacklisted on the host in order for the guest to be able to load it. Now we need to check to see if the module is currently loaded on the host with the following command:
<!---Please provide a lead-in sentence--->
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's obvious by the heading as to what this is about. No lead in necessary.

1.Unload the `ath9k_htc` module to take effect immediately, and blacklist it so that it does not load on boot. The module needs to be blacklisted on the host in order for the guest to be able to load it. Now we need to check to see if the module is currently loaded on the host with the following command:
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For ordered lists, a space is required after the .
Such as:
1.
2.
3.

Are you OK with converting this to an ordered list @holisticinfosec?
Also are you happy with these other grammer changes @holisticinfosec, they seem OK to me?


`lsmod | grep -e ath`

We are looking for `ath9k_htc`. If it is visible in the output produced from the previous command, unload it with the following command:
2.We are looking for `ath9k_htc`. If it is visible in the output produced from the previous command, unload it with the following command:

`modprobe -r ath9k_htc`

Next you will need to create a blacklist file in `/etc/modprobe.d/`
3.Next you will need to create a blacklist file in `/etc/modprobe.d/`
Create `/etc/modprobe.d/blacklist-ath9k.conf` and add the following text into it and save:

`blacklist ath9k_htc`

I had to do the following step on Kali 1.1, but it seems it is no longer necessary in Kali 2016.1 rolling. If you are still on 1.1, go into the settings of your VM -> USB -> and add a Device Filter. I named this tl-wn722n and added the Vendor and Product IDs we discovered with `lsusb`. Make sure Enable USB 2.0 (EHCI) Controller is also enabled.
4.I had to perform the following step on Kali 1.1, but it seems it is no longer necessary in Kali 2016.1 rolling. If you are still on 1.1, go into the settings of your VM -> USB -> and add a Device Filter. I named this tl-wn722n and added the Vendor and Product IDs we discovered with the `lsusb` command. Make sure Enable USB 2.0 (EHCI) Controller is also enabled as shown in the following screenshot:

![](images/USBDeviceFilter.png)

Expand Down Expand Up @@ -714,7 +715,7 @@ I had to do the following step on Kali 1.1, but it seems it is no longer necessa
##### Test:

Plug your Wi-Fi adapter into your laptop.

<!---Please provide a lead-in--->
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think it needs it. Thoughts @holisticinfosec?

In the Devices menu of your guest -> USB Devices, you should be able to select the ATHEROS USB2.0 WLAN adapter.

Run `dmesg | grep htc`, you should see something similar to the following printed:
Expand Down