search

neraliu / tainted-phantomjs

Tainted PhantomJS
BSD 3-Clause "New" or "Revised" License
53 stars 12 forks source link

Getting a diff from the original code #1

Open andresriancho opened 10 years ago

andresriancho commented 10 years ago

This repo looks promising, I've been looking for an automated dom xss analyzer for some time now... I would like to know the phantomjs revision you used when forking, so I can do a diff and read your changes, is that possible?

neraliu commented 10 years ago

do u mean the code diff of the original phantomjs?

andresriancho commented 10 years ago

Well, the final objective for me is to get the code diff between phantomjs and this repo; the way I can do that is if you guys tell me the exact revision of phantomjs where you forked it, and started to work on tpjs.

This revision number is also important for you guys, if you ever want to merge upstream intro tpjs to get new features and bug fixes.

neraliu commented 10 years ago

agreed, i will make some rules within our code to make sure we are in sync with the original phantomjs. let me make it this week.

neraliu commented 10 years ago

i am closing this as the actionable item is tracking in issue #14

neraliu commented 10 years ago

issue #15 will also take care the request in this ask. fyi

andresriancho commented 10 years ago

Not sure if any of #14 or #15 will solve this issue. All I would like to see is a sentence saying: "We started to work on tpjs based on phantomjs revision XXXXXX from the github repo YYYYY".

yukinying commented 10 years ago

Agree... would be best if we can have a script that generate the diff (from specific phantomjs revision) and commit the result into git. Also great if we can merge the diff with newer version of phantomjs so we can keep the repo up-to-date.

neraliu commented 10 years ago

i am using the master branch of phantomjs in day one, so the phantomjs part would be easily to catch up. in order to let other to know which copy of phantomjs we are using, i will merge the code and tag it with the commit hash of the phantomjs like below suggested.

tag conversion: phantomjs-4d2fedf243 https://github.com/ariya/phantomjs/commit/4d2fedf2431111bbb7c195347835fc19699fb68d

neraliu commented 10 years ago

let's reopen this issue as the requirement of "getting code diff of tpjs and phantomjs"