solutus 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b04c38164c87829f2c2908ef025b83c2c6c57883bec8c6a0c1a36e96406dbec6
-  data.tar.gz: 19670e1dec56f403d484b180ee2bdba8bacdf1fc203b8949027e763acb02f08f
+  metadata.gz: 615a04274d007c7612352ad3ac5c941de06dea56621269225c1e0cb4f71ff07b
+  data.tar.gz: a35acf50ab7948dd020bb8530779fc2ec2f9ad544c6f27626ebb6008610947c5
 SHA512:
-  metadata.gz: 6908bc0fe5cc77a11e9547bbd3336bf5a4aac65568e0324cd25837dbd72ee6e5a6a58c21ca4cab353f238cc92d9937af7f99297d0b7a8c4b07d076e3e616e2ff
-  data.tar.gz: 14475f41fcdf8394a6e1ec48d7150054d8bab94e7990961a6cba580fc84d97157e07363f029b0bbbf5f6b360c932edfa19ea04eaa3c2df1bc9a3c890b0e5e84f
+  metadata.gz: 66220afe441695e91441e285cbe68b19655e831a96bb951ea2ba92fb558a2cc3ba40af44be913ceecc6283df1c6d37a6808089fc402252b43497345f246f109c
+  data.tar.gz: 619a7e1e9d7cc3e366d04feebc881204d5520133762ef6717cf3cc5cc0969a6e31afa97e5d5a35b7f8b03db4a624f3490404e107d6b2f5b62fe76910215a5b3b

data/lib/solutus.rb

@@ -30,7 +30,7 @@ class Solutus
     PASSWORD_FILE = "password.txt"
     DAY_ENDINGS = ["th", "st", "nd", "rd", "th", "th", "th", "th", "th", "th", "th", "th", "th", "th", "th", "th", "th", "th", "th", "th", "th", "st", "nd", "rd", "th", "th", "th", "th", "th", "th", "th", "st"]
 
-    VERSION = '0.1.7'
+    VERSION = '0.1.8'
 
     LOG_FILE = 'log'
 
@@ -57,6 +57,7 @@ class Solutus
 
     class Solutus_Server < Sinatra::Base
         CSS = File.read(File.join(File.dirname(File.expand_path(__FILE__)), '../resources', "style.css"))
+        FILE_EXCLUDES = ['password.txt', '.gitignore', 'nohup.out', 'log']
         enable :sessions
 
         set :public_folder, SITE_PATH
@@ -146,6 +147,30 @@ class Solutus
             "saved page @ #{path}"
         end
 
+        get "/newpage" do
+            dir = params['dir']
+            filename = params['filename']
+            dir = File.join(SITE_PAGES_PATH, dir)
+            path = File.join(dir, filename) + '.yml'
+            if !File.directory?(dir)
+                FileUtils.mkdir_p(dir)
+            end
+            f = File.new(path, 'w')
+            title = 'Page Title'
+            text = <<HERE
+template: default
+title: #{title}
+content: |
+    <h1>#{title}</h1>
+    <p>
+        Some Content
+    </p>
+HERE
+            f.write(text)
+            write_log("Created page #{path} from #{request.ip}")
+            redirect "/edit"
+        end
+
         post "/newpost" do
             if !session[:verified]
                 return render_login("You were logged out.")
@@ -195,7 +220,11 @@ class Solutus
                 return render_login("You were logged out.")
             end
             path = params['path']
-            render_edit_file(path)
+            if File.file?(path)
+                render_edit_file(path)
+            else
+                'error, not a file'
+            end
         end
 
         post "/savefile" do
@@ -203,6 +232,10 @@ class Solutus
                 return 'error'
             end
             path = params['path']
+            if FILE_EXCLUDES.include?(path.split("/"[-1]))
+                write_log("security breach attempt @ #{path} from #{request.ip}")
+                return 'security error'
+            end
             content = params['content']
             f = File.open(path, 'w')
             f.write(content)
@@ -216,8 +249,8 @@ class Solutus
             if !session[:verified]
                 return "error"
             end
-            Solutus.command("deploy")
-            "deployed"
+            Solutus.command("build")
+            "built"
         end
 
         get "/:page" do
@@ -351,6 +384,19 @@ class Solutus
             settings.global_settings.each do |key, val|
                 result[key.to_sym] = val
             end
+            dirs = Dir.entries(SITE_PAGES_PATH)
+            puts dirs
+            dir_res = ''
+            dirs.each do |d|
+                if File.directory?(File.join(SITE_PAGES_PATH, d)) && d != ".."
+                    val = d + "/"
+                    if val == '.'
+                        val = "/"
+                    end
+                    dir_res += "<option value='#{d}'>#{val}</option>"
+                end
+            end
+            result[:page_paths] = dir_res
             result[:blogs] = blog_select
             result[:pages] = page_select
             result[:css] = CSS
@@ -375,11 +421,17 @@ class Solutus
             dirs = [".", "static/css", "templates", "pages/site-pages"]
             dirs.each do |dir|
                 result += "<optgroup label='#{dir}'>"
-                files = Dir.entries(dir).select {|f| !File.directory? f}
+                if dir == "."
+                    files = Dir.entries(dir).select {|f| !File.directory? f}
+                else
+                    files = Solutus.relative_path_to_all_files_in_dir(dir)
+                end
                 files.each do |filename|
-                    if !['password.txt', '.gitignore', 'nohup.out', 'log'].include?(filename)
+                    if !FILE_EXCLUDES.include?(filename)
                         path = File.join(dir, filename)
-                        result += "<option value=\"#{path}\">#{filename}</option>\n"
+                        if File.file?(path)
+                            result += "<option value=\"#{path}\">#{filename}</option>\n"
+                        end
                     end
                 end
                 result += "</optgroup>"
@@ -418,7 +470,6 @@ class Solutus
 
     def self.command(*args)
         start_time = Time.now
-
         if args.length >= 1
             if ["-v", "--version"].include?(args[0])
                 puts VERSION
@@ -588,7 +639,7 @@ HERE
         end    
 
         @@page_urls = Array.new
-        Dir.entries(SITE_PAGES_PATH).each do |entry|
+        relative_path_to_all_files_in_dir(SITE_PAGES_PATH).each do |entry|
             next if entry == "." || entry == ".."
             puts "Rendering page #{entry}"
             path = File.join(SITE_PAGES_PATH, entry)
@@ -790,6 +841,21 @@ HERE
         result
     end
 
+    def self.relative_path_to_all_files_in_dir(dir)
+        result = Array.new
+        Dir.entries(dir).each do |entry|
+            next if entry == "." || entry == ".."
+            path = File.join(dir, entry)
+            if File.file?(path)
+                result.push(entry)
+            elsif File.directory?(path)
+                result = result + relative_path_to_all_files_in_dir(path).collect {|x| File.join(entry, x)}
+            end
+        end
+        result
+    end
+
+
     def self.create_password(password)
         content = Digest::MD5.hexdigest password
         if File.file?(PASSWORD_FILE)

data/resources/editFile.html

@@ -6,9 +6,8 @@
     <script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.38.0/mode/htmlmixed/htmlmixed.js"></script>
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.38.0/theme/lesser-dark.css">
     <style type="text/css">
-        
+        {{css}}
     </style>
-    {{{stylesheets}}}
 </head>
 
 <body>
@@ -20,7 +19,6 @@
     <script>
         var myCodeMirror = CodeMirror.fromTextArea(document.getElementById('editor'), {
             lineNumbers: true,
-            styleActiveLine: true,
             matchBrackets: true,
             theme: 'lesser-dark'
         });

data/resources/index.html

@@ -24,6 +24,18 @@
             </fieldset>
         </form>
     </p>
+
+    <p>
+        <form method="get" action="/newpage">
+            <fieldset>
+                <legend>New Page</legend>
+                Page subdirectory: 
+                <select name='dir'>{{{page_paths}}}</select>
+                <p>Page name: <input type='text' name='filename'></p>
+                <p><button type="submit">Create page</button></fieldset></p>
+            </fieldset>
+        </form>
+    </p>
     {{/advanced}}
     {{^advanced}}
     <p>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solutus
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Jerome Wei