Skip to content

Latest commit

 

History

History
67 lines (57 loc) · 2.77 KB

README.md

File metadata and controls

67 lines (57 loc) · 2.77 KB
Raw

Security Research

This repo contains the code/data from multiple projects produced by the Security Research team at ServiceNow. The associated blog posts of these project can be found here.

Adding Projects

Each project added should be in its own directory. If the project being added is contained within its own git repo and all files within the repo can be published publicly, use git subtree to add the project to this repo. This allows any changes to the project be easily pushed to this repo in the future. Otherwise, manually create the directory and copy the files over to this repo.

## Add a new project to this repo using subtree

# Add the project repo as a remote for this repo
git remote add -f [remote-name] [git@remote-path.git]
# Add the project at [remote-name] [remote-branch] to this repo under the folder [folder-name]
# This is will only include files from [remote-name] [remote-branch], no commits will be copied over
git subtree add --prefix [folder-name] [remote-name] [remote-branch] --squash

## Update an existing project in this repo that was added using subtree

# Grab the new data from [remote-name] [remote-branch]
git fetch [remote-name] [remote-branch]
# Merge the project at [remote-name] [remote-branch] to this repo under the folder [folder-name]
# This is will only include files from [remote-name] [remote-branch], no commits will be copied over
git subtree pull --prefix [folder-name] [remote-name] [remote-branch] --squash

(Normal User) Publishing to the Public Repo

  1. Clone the internal repo using: 
    git clone [internal-repo-path]
  2. Make the necessary modifications to the main local branch that was just cloned.
  3. Add and commit all modifications to the main local branch. This may have been done already if you used the subtree commands above. 
    git add -A; git commit -m "bla"
  4. Push all modifications to the main remote branch. 
    git push
  5. Ask an admin to merge the main branch into the publish branch and push the changes to the external repo.

(Admin) Publishing to the Public Repo

  1. Clone the internal repo using: 
    git clone [internal-repo-path]
  2. Checkout the publish branch. 
    git checkout publish
  3. Merge the commits from main into the publish branch and push the changes up to the internal repo. 
    git merge main --strategy-option theirs --squash
git commit -m "merging changes"
git push
  4. Add the external repo as a remote and fetch its branches. 
    git remote add publish git@github.com:ServiceNow/SecurityResearch.git
git fetch publish
  5. Push the publish branch to the external repo's main branch. 
    git push publish publish:main