puppetfactory 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38a7e8adf9316dfd8228109df2fdf418988cb1cf
-  data.tar.gz: d860112658d89746e951733c69edac617bf6d862
+  metadata.gz: 0defb4a5fbab3fde2d073057715dc654b1be2fec
+  data.tar.gz: 643d210bd66a82fd45dd6ccb2a92d2e712e5be2b
 SHA512:
-  metadata.gz: ba9b43f391a6d3e9e9bb5dc469ff63fe368c592a77ffa986dd542a5707afb4843d54c82989dfaf2742b905710ff1fd4be9c022f27d59bafc6f93d9b1c7c21ed2
-  data.tar.gz: e44cd56760233534a617db20435a84f13f57f9a3ba347cb35058255c722fdbb567b6759140bb9e8109e2eaf7c6b5f8b16287884fd59e143fec27ac671e656539
+  metadata.gz: a01c67184868af5f3a0d0c86afbee274158bbc718cebe9895ded0d503b8ac33df569a28a98bad983308a673f596bce4ce4388780b688c92c802540d838821587
+  data.tar.gz: 5ccd590f691f071cbf7b6b83c0a21c560341b639a65269fed98a2eafbf8a438b9932c4e98d615c2d089835ca50ec530009b5e7348519ae6bbe603078518bfdee

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# v0.6.5
+* Support recloning the control repo if the master is misclassified
+* Prevent users from committing to branches they don't own
+* Update the Docker container mount points
+
 # v0.6.4
 * Corrected some UI artifacts.
 * Display username in alternate login section.

data/lib/puppetfactory/plugins/docker.rb

@@ -31,10 +31,11 @@ class Puppetfactory::Plugins::Docker < Puppetfactory::Plugins
       environment = "#{@environments}/#{Puppetfactory::Helpers.environment_name(username)}"
       binds = [
         "/var/yum:/var/yum",
-        "/var/cache:/var/cache",
+        "/var/cache/rubygems:/var/cache/rubygems",
+        "/var/cache/yum:/var/cache/yum",
         "/etc/pki/rpm-gpg:/etc/pki/rpm-gpg",
 #        "/etc/yum.repos.d:/etc/yum.repos.d", # we can't share this because of pe_repo.repo
-        "/opt/puppetlabs/server:/opt/puppetlabs/server",
+#        "/opt/puppetlabs/server:/opt/puppetlabs/server",
         "/home/#{username}/puppet:#{@confdir}",
         "/sys/fs/cgroup:/sys/fs/cgroup:ro"
       ]

data/lib/puppetfactory/plugins/gitea.rb

@@ -10,6 +10,7 @@ class Puppetfactory::Plugins::Gitea < Puppetfactory::Plugins
 
     @cache_dir      = '/var/cache/puppetfactory/gitea'
     @lockfile       = '/var/cache/puppetfactory/gitea.lock'
+    @templatedir    = options[:templatedir]
     @suffix         = options[:usersuffix]
     @controlrepo    = options[:controlrepo]
     @reponame       = File.basename(@controlrepo, '.git')
@@ -28,7 +29,7 @@ class Puppetfactory::Plugins::Gitea < Puppetfactory::Plugins
     # gitea will scream if the admin's .ssh directory doesn't exist
     FileUtils.mkdir_p(File.expand_path("~#{@admin_username}/.ssh"))
 
-    migrate_repo! unless File.directory?(@cache_dir)
+    migrate_repo! unless File.directory?(@repopath)
   end
 
   def create(username, password)
@@ -87,6 +88,12 @@ class Puppetfactory::Plugins::Gitea < Puppetfactory::Plugins
           raise output unless status.success?
         end
 
+        hookfile = File.expand_path("~#{@gitea_user}/gitea-repositories/root/#{@controlrepo}/hooks/pre-receive.d/pre-receive")
+        File.open(hookfile, 'w') do |f|
+          f.write ERB.new(File.read("#{@templatedir}/pre-receive.erb")).result(binding)
+        end
+        FileUtils.chmod 0755, hookfile
+
       rescue => e
         $logger.error "Error migrating repository: #{e.message}"
         $logger.error e.backtrace.join("\n")

data/templates/pre-receive.erb

@@ -0,0 +1,19 @@
+#! /bin/sh
+while read oldrev newrev refname; do
+  author=$(git log -1 --format='%an' $newrev)
+
+  # superuser always gets a pass
+  if [[ "${author}" == "<%= @admin_username %>" ]]; then
+    continue
+
+  # creating a new branch
+  elif [[ "${oldrev}" == "0000000000000000000000000000000000000000" ]]; then
+    continue
+
+  elif [[ ! $refname =~ ^refs/heads/${author}-? ]]; then
+    echo "<br><br><br>-- Hi there. You should be working on the '${author}' branch or a feature branch. --<br><br><br>"
+    exit 1
+  fi
+done
+
+exit 0

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: puppetfactory
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Ben Ford
-- Josh Samuelson
 - Michael Marrero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-23 00:00:00.000000000 Z
+date: 2018-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -246,6 +245,7 @@ files:
 - public/jstree-3.3.3/themes/default/style.min.css
 - public/jstree-3.3.3/themes/default/throbber.gif
 - templates/init_scripts.erb
+- templates/pre-receive.erb
 - templates/puppet.conf.erb
 - templates/site.pp.erb
 - views/currentuser.erb
@@ -275,7 +275,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Stands up a graphical classroom manager with containerized puppet agents.