Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

oui DB update #966

Closed
wants to merge 5 commits into from
Closed

oui DB update #966

wants to merge 5 commits into from

Conversation

agentzex
Copy link
Contributor

No description provided.

This script fetch his data from https://svn.nmap.org/nmap/nmap-mac-prefixes , parse it and updates the "wifiphisher-mac-prefixes" file accordingly
@sophron sophron self-assigned this Jul 13, 2018
@sophron
Copy link
Member

sophron commented Jul 13, 2018

Nice. That was fast. A few more things to complete this PR.

  1. Remove update_oui_list and update_oui_db.py from your PR. There's no need to include it in our main repository since it's only useful for us (the developers) and not Wifiphisher users.

  2. If you noticed our format in wifiphisher-mac-prefixes, it is the following:

<BSSID>|<VENDOR>|(LOGO_FILE)

For example an entry can be: "1CBDB9|D-Link International|dlink.png"

The third part, the logo, is optional and is actually deprecated. We used to use this information when we were displaying a logo in our "Firmware Upgrade" scenario. We are not doing this anymore (due to copyright reasons) so we are free to remove these and change our format simply to <BSSID>|<VENDOR>. Do you mind updating these entries to the new format too?

  1. After you are finished, you will have to "squash" your commits in one commit in order for us to have a clean history in the repo. There are many tutorials on the Internet that can help you, here's one: http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html

After that, I will proceed with merging this.

@blackHatMonkey
Copy link
Member

@sophron maybe we can create a small bash script that does this so we can periodically run this?

@agentzex
Copy link
Contributor Author

1.I can't find a way to delete commits, do I have to close this PR and create a new one to delete the unncessery files?
And I understand what you're saying about it's not needed for the users, but since you said you want it to be always updated altough you also want it to work without updaing via internet, I just thought you'll want this script saved somewhere, so if you or a user wants to update it manually from the svn source it will be possible with running it.
2. Will do
3. I'll check this, I'm still new with github

Thanks

@sophron
Copy link
Member

sophron commented Jul 13, 2018

@blackHatMonkey The script that @Dor-alt has attached can probably be used for this purpose.

@agentzex
Copy link
Contributor Author

@sophron on the latest project I've worked on , we had some "utils" directory, that we've saved those kind of scripts somewhere in the projects

@sophron
Copy link
Member

sophron commented Jul 13, 2018

@Dor-alt No. You just need to "git rm" the files and then "push" again.

This is not really something that a user has to do. The user doesn't even need to know the technical details or how exactly we are using this database.

We could have a specific branch for all of our "development" or "maintenance" tools. Your script could fit there. @blackHatMonkey's script on PR #956 could also fit there. What do you think?

Take your time with git! A good learning spot to start lies here: https://lab.github.com/

@blackHatMonkey
Copy link
Member

@sophron We could just put all of our scripts in a script/ directory. Those won't be included by pip anyway.

@sophron
Copy link
Member

sophron commented Jul 14, 2018

@Dor-alt, I see that you created #969 too. Which PR do you want us to follow?

@agentzex
Copy link
Contributor Author

Hi
I tried to squash (I know it as merge ) all commits to one single commit, I followed this too https://blog.github.com/2016-04-01-squash-your-commits/
but from what I understand only the project owner can approve the merge,

@agentzex
Copy link
Contributor Author

#969 - is where I also deleted the file I created by mistake, so I guess I will close this one and we'll follow 969

@agentzex agentzex closed this Jul 14, 2018
@agentzex agentzex deleted the patch-1 branch July 14, 2018 12:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants