Remediation for CVE-2021-45105 and CVE-2021-23463

bastillion-io · Dec 21, 2021 · 8b78462 · 8b78462
1 parent 779d805
commit 8b78462
Show file tree

Hide file tree

Showing 14 changed files with 2,740 additions and 102 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,10 +5,16 @@
 *.war
 *.ear
 target/*
+node/*
+node_modules/*
+src/main/webapp/_res/node/*
 .idea/*
 *.iml
 *.DS_Store
-/.project
-/.classpath
-/.settings/
 /target/
+/bin/
+
+# Eclipse Project Setting #
+.classpath
+.project
+.settings/*
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -0,0 +1,88 @@
+module.exports = function(grunt) {
+    grunt.initConfig({
+        node: './node_modules',
+        dest: './src/main/webapp/_res/node',
+        destJs: '<%= dest %>/js',
+        destCss: '<%= dest %>/css',
+        clean: {
+            build: {
+                src: ['<%= dest %>']
+            }
+        },
+        mkdir: {
+            all: {
+              options: {
+                create: ['<%= destCss %>/jquery-ui/images', '<%= destJs %>/jquery-ui/widgets']
+              },
+            },
+        },
+        copy: {
+            main: {
+                files: [
+                    {
+                        expand: true,
+                        flatten: true,
+                        src: ['<%= node %>/bootstrap/dist/css/*',
+                              '<%= node %>/xterm/css/xterm.*'
+                             ],
+                        dest: '<%= destCss %>/',
+                        filter: 'isFile'
+                    },
+                    {
+                        expand: true,
+                        flatten: true,
+                        src: ['<%= node %>/jquery-ui/themes/base/*'],
+                        dest: '<%= destCss %>/jquery-ui/',
+                        filter: 'isFile'
+                    },
+                    {
+                        expand: true,
+                        flatten: true,
+                        src: ['<%= node %>/jquery-ui/themes/base/images/*'],
+                        dest: '<%= destCss %>/jquery-ui/images',
+                        filter: 'isFile'
+                    },
+                    {
+                        expand: true,
+                        flatten: true,
+                        src: ['<%= node %>/jquery/dist/jquery.min.*',
+                              '<%= node %>/@popperjs/core/dist/umd/popper.min.*',
+                              '<%= node %>/bootstrap/dist/js/bootstrap.min.*',
+                              '<%= node %>/floatthead/dist/jquery.floatThead.min.*',
+                              '<%= node %>/xterm/lib/xterm.*',
+                              '<%= node %>/xterm-addon-fit/lib/xterm-addon-fit.*'
+                              ],
+                        dest: '<%= destJs %>/',
+                        filter: 'isFile'
+                    },
+                    {
+                        expand: true,
+                        flatten: true,
+                        src: ['<%= node %>/jquery-ui/ui/*.*'],
+                        dest: '<%= destJs %>/jquery-ui/',
+                        filter: 'isFile'
+                    },
+                    {
+                        expand: true,
+                        flatten: true,
+                        src: ['<%= node %>/jquery-ui/ui/widgets/draggable.*',
+                              '<%= node %>/jquery-ui/ui/widgets/droppable.*',
+                              '<%= node %>/jquery-ui/ui/widgets/resizable.*',
+                              '<%= node %>/jquery-ui/ui/widgets/selectable.*',
+                              '<%= node %>/jquery-ui/ui/widgets/sortable.*',
+                              '<%= node %>/jquery-ui/ui/widgets/mouse.*'
+                             ],
+                        dest: '<%= destJs %>/jquery-ui/widgets',
+                        filter: 'isFile'
+                    }
+                ]
+            }
+        }
+    });
+
+    grunt.loadNpmTasks('grunt-contrib-clean');
+    grunt.loadNpmTasks('grunt-mkdir');
+    grunt.loadNpmTasks('grunt-contrib-copy');
+
+    grunt.registerTask('default', ['clean','mkdir','copy']);
+};
diff --git a/README.md b/README.md
@@ -1,5 +1,4 @@
-![Bastillion for EC2](https://www.bastillion.io/images/bastillion_40x40.png) 
-Bastillion for EC2
+![Bastillion for EC2](https://www.bastillion.io/images/bastillion_40x40.png) Bastillion for EC2
 ======
 A web-based ssh console to execute commands and manage multiple EC2 instances
 simultaneously running on Amazon Web Services (AWS). Bastillion-EC2 allows you to share