Upgrading Dradis-CE 3.1.0rc2 to latest via git pull


#1

Hi

Referring to some of the new features mentioned in this thread I went ahead and tried to upgrade dradis. I first stopped all my dradis services then ran through the following commands below which all completed without error. All seemingly went fine with the git pull, after stashing some changes to my Gemfile.lock file, however after a reboot and restarting all dradis services as below when opening the web browser to the dradis page I remain on v3.1.0rc2.

bundle exec rails server
redis-server

What am I missing here? what is the latest version? Why aren’t I seeing these new features ?!

Thanks

========
Step 1
+++++++

Made local backups of some custom template files

Step 2
+++++++
Tried git pul in /opt/dradis-ce

Updating 0ae3cb3…0c8b345
error: Your local changes to the following files would be overwritten by merge:
Gemfile.lock
Please commit your changes or stash them before you merge.
Aborting

Step 3
+++++++

git stash

Saved working directory and index state WIP on master: 0ae3cb3 Pin dradis-burp to 3.0.2

HEAD is now at 0ae3cb3 Pin dradis-burp to 3.0.2

Step 4
+++++++

git pull -v

From https://github.com/dradis/dradis-ce

= [up to date] master -> origin/master
[snip]

Step 5
+++++++

bundle update dradis-metasploit
Fetching https://github.com/dradis/dradis-projects.git
Fetching https://github.com/dradis/dradis-plugins.git
Fetching gem metadata from https://rubygems.org/
Fetching version metadata from https://rubygems.org/
Fetching dependency metadata from https://rubygems.org/
Resolving dependencies…
[snip]
Using dradis-html_export 3.3.3 (was 3.6.0)
Bundle updated!


Tool import issue
#2

@Kalaratri, it looks like you ran git pull -v instead of git pull. Can you try running the git pull and let us know how it goes? Here’s a Stack Overflow thread that explains the difference in a bit more depth: http://stackoverflow.com/questions/24180719/git-pull-v-up-to-date-but-isnt


#3

git pull -v is just the verbose mode with extra output for debugging as far as I know.

https://git-scm.com/docs/git-pull


#4

PS What is the latest version? I can also send the full git pull log if that would help? I can’t attach it here.


#5

@Kalaratri, the version is still going to be 3.1.0rc2 after git pulling: https://github.com/dradis/dradis-ce/blob/master/lib/dradis/ce/version.rb

Let’s check a few things?

  1. What branch are you on? git status should give you that. If you’re not on master, switch to master and git pull again

  2. What do you get when you run git log? My output (today, April 17th, this will change the next time the master branch is updated!) shows:

commit 0c8b3459983a189eb19ec979506c7de834efb77b
Author: Daniel Martin etd-github@nomejortu.com
Date: Mon Apr 3 13:34:03 2017 +0200
Bump dradis-metasploit

If it doesn’t, we still need to get you the latest commit(s).


#6

Looking through my logs it certainly looks like my local repository was updated successfully as we can see from 4 days ago:

ls -l
total 132
drwxr-xr-x 12 root root 4096 Apr 14 09:23 app
drwxr-xr-x 2 root root 4096 Apr 14 09:23 bin
-rw-r–r-- 1 root root 6054 Feb 25 02:06 CHANGELOG
drwxr-xr-x 6 root root 4096 Apr 14 09:23 config
-rw-r–r-- 1 root root 379 Feb 25 02:06 config.ru
-rw-r–r-- 1 root root 3286 Feb 25 02:06 CONTRIBUTING.md
drwxr-xr-x 3 root root 4096 Mar 29 14:08 db
drwxr-xr-x 3 root root 4096 Feb 25 02:06 engines
-rw-r–r-- 1 root root 5974 Apr 14 09:23 Gemfile
-rw-r–r-- 1 root root 12244 Apr 14 09:27 Gemfile.lock
-rw-r–r-- 1 root root 1315 Feb 25 03:08 Gemfile.plugins
-rw-r–r-- 1 root root 1742 Apr 14 09:23 Gemfile.plugins.template
drwxr-xr-x 7 root root 4096 Feb 25 02:06 lib
-rw-r–r-- 1 root root 18092 Feb 25 02:06 LICENSE.txt
drwxr-xr-x 2 root root 4096 Mar 29 14:52 log
drwxr-xr-x 2 root root 4096 Feb 25 02:06 packaging
drwxr-xr-x 2 root root 4096 Feb 25 02:06 public
-rw-r–r-- 1 root root 284 Feb 25 02:06 Rakefile
-rw-r–r-- 1 root root 5217 Apr 14 09:23 README.md
drwxr-xr-x 11 root root 4096 Feb 25 02:06 spec
-rw-r–r-- 1 root root 527 Feb 25 02:06 Thorfile
drwxr-xr-x 5 root root 4096 Feb 25 03:28 tmp
-rw-r–r-- 1 root root 4081 Feb 25 02:06 Vagrantfile
drwxr-xr-x 3 root root 4096 Feb 25 02:06 vendor

I’m on master branch:

git status
On branch master
Your branch is up-to-date with ‘origin/master’.

Here’s a small section of the git log:

git log
commit 0c8b3459983a189eb19ec979506c7de834efb77b
Author: Daniel Martin etd-github@nomejortu.com
Date: Mon Apr 3 13:34:03 2017 +0200

Bump dradis-metasploit

commit f17ea06a185a2a5c4b6ed4b4b72c354f41bb9585
Author: Daniel Martin etd-github@nomejortu.com
Date: Fri Mar 31 15:55:17 2017 +0200

Bump font-awesome to 4.7

commit 360349e8c51e9be066e0bb53c7a3a460ea154aff
Merge: 67e3e4c 3102f17
Author: Daniel Martin etd-github@nomejortu.com
Date: Fri Mar 31 13:53:59 2017 +0200

Merge pull request #107 from dradis/rubocop

Add Rubocop to the code

commit 3102f174b8ae22fe752529891956aed7e38d572e
Author: Daniel Martin etd-github@nomejortu.com
Date: Fri Mar 31 13:49:26 2017 +0200

Activities#poll - move double quotes

commit 3cb4c325e3be6be24427080cba0672db49667c99
Author: Daniel Martin etd-github@nomejortu.com
Date: Fri Mar 31 13:41:07 2017 +0200

So have the new features not made it into the master branch yet?


#7

It’s like waiting for christmas with these new features! I would have used search about 20 times today!


#8

@Kalaratri the git log looks good… :thinking: have you restarted your rails server after pulling the local changes? (e.g. CTRL + C to shut down the rails server, then running $ bundle exec rails server again to restart it)


#9

Hi again, yes I stopped all Dradis related services (3) before the git pull and restarted after completion.

I think the issue may perhaps lie in the Master branch I’m using.

Reading Daniel’s email regarding the 3.6 released and reviewing the listing of git branches suggests I should be using the release-3.6 branch:

I’ll try switching to this branch and running another git pull shortly


#10

Hi again,

So I tried to upgrade to 3.6 as I see the release 3.6 branch has now been merged back in with the master branch, however I ran into ciritcal issues. I’ve moved this over to github issues:

https://github.com/dradis/dradis-ce/issues/111

Hope you can assist in resolving this so I can take advantage of the new features.


#11

Hi Rachel / Daniel

Success! Or partial success anyway!

I have finally managed to get Dradis-CE 3.6 running. I believe most of my problems getting it running were due to running Dradis services in different locations.

I kept detailed notes along the way, so have imported them to the github link to help others.

I still have two issue to resolve but will create separate threads for those. Project import fails as does running RAILS_ENV=production bundle exec thor dradis from opt/dradis-ce