diff --git a/ghostwriter/shepherd/views.py b/ghostwriter/shepherd/views.py
index aae9ed6db..b35c13dad 100644
--- a/ghostwriter/shepherd/views.py
+++ b/ghostwriter/shepherd/views.py
@@ -612,10 +612,10 @@ def infrastructure_search(request):
if search_term:
server_qs = StaticServer.objects.filter(
- Q(ip_address__contains=search_term) | Q(name__contains=search_term)
+ Q(ip_address__contains=search_term) | Q(name__icontains=search_term)
)
vps_qs = TransientServer.objects.select_related("project").filter(
- Q(ip_address__contains=search_term) | Q(name__contains=search_term)
+ Q(ip_address__contains=search_term) | Q(name__icontains=search_term)
)
aux_qs = AuxServerAddress.objects.select_related("static_server").filter(
ip_address__contains=search_term
diff --git a/ghostwriter/static/js/tinymce/config.js b/ghostwriter/static/js/tinymce/config.js
index dda7b836e..c9f4c771a 100644
--- a/ghostwriter/static/js/tinymce/config.js
+++ b/ghostwriter/static/js/tinymce/config.js
@@ -38,12 +38,12 @@ var default_config = {
edit: { title: 'Edit', items: 'undo redo | cut copy paste | selectall | searchreplace' },
view: { title: 'View', items: 'code | visualchars visualblocks | preview' },
insert: { title: 'Insert', items: 'evidenceUpload codesample link' },
- format: { title: 'Format', items: 'bold italic underline strikethrough superscript subscript codeformat | formats fontformats fontsizes align | forecolor | removeformat' },
+ format: { title: 'Format', items: 'bold italic underline strikethrough superscript subscript codeformat case | formats fontformats fontsizes align | forecolor | removeformat' },
tools: { title: 'Tools', items: 'code wordcount' },
},
toolbar_mode: 'floating',
- plugins: 'visualchars visualblocks save preview lists image hr autosave advlist code wordcount codesample searchreplace paste link',
- toolbar: 'subscript superscript bold italic underline link blockquote | bullist numlist | codesample codeInline | evidenceUpload | removeformat save',
+ plugins: 'visualchars visualblocks save preview lists image hr autosave advlist code wordcount codesample searchreplace paste link case',
+ toolbar: 'subscript superscript bold italic underline link blockquote case | bullist numlist | codesample codeInline | evidenceUpload | removeformat save',
contextmenu: 'bold italic link removeformat',
paste_as_text: true,
paste_data_images: false,
diff --git a/ghostwriter/static/js/tinymce/plugins/case/LICENSE.md b/ghostwriter/static/js/tinymce/plugins/case/LICENSE.md
new file mode 100644
index 000000000..a4d629309
--- /dev/null
+++ b/ghostwriter/static/js/tinymce/plugins/case/LICENSE.md
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020 Melquisedeque Brito de Lima
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/ghostwriter/static/js/tinymce/plugins/case/plugin.js b/ghostwriter/static/js/tinymce/plugins/case/plugin.js
new file mode 100644
index 000000000..510730fb7
--- /dev/null
+++ b/ghostwriter/static/js/tinymce/plugins/case/plugin.js
@@ -0,0 +1,227 @@
+/**
+ * @copyright ©Melqui Brito. All rights reserved.
+ * @author Melqui Brito
+ * @version 1.2.0 (2020-03-08)
+ * @description Tinymce custom plugin for changing text case.
+ */
+
+(function () {
+ tinymce.PluginManager.add('case',
+ function (editor) {
+
+ const strings = {
+ TOOLNAME: 'Change Case',
+ LOWERCASE: 'lowercase',
+ UPPERCASE: 'UPPERCASE',
+ SENTENCECASE: 'Sentence case',
+ TITLECASE: 'Title Case'
+ }, defaultTitleCaseExeptions = [
+ 'at', 'by', 'in', 'of', 'on', 'up', 'to', 'en', 're', 'vs',
+ 'but', 'off', 'out', 'via', 'bar', 'mid', 'per', 'pro', 'qua', 'til',
+ 'from', 'into', 'unto', 'with', 'amid', 'anit', 'atop', 'down', 'less', 'like', 'near', 'over', 'past', 'plus', 'sans', 'save', 'than', 'thru', 'till', 'upon',
+ 'for', 'and', 'nor', 'but', 'or', 'yet', 'so', 'an', 'a', 'some', 'the'
+ ], getParameterArray = function (param) {
+ let value = editor.getParam(param);
+ if (value) {
+ if (Array.isArray(value)) {
+ return value;
+ } else if (typeof value === "string") {
+ return value.replace(/(\s{1,})/g, "?").trim().split('?');
+ }
+ }
+ if (param === 'title_case_minors') {
+ return defaultTitleCaseExeptions
+ }
+ return false
+ }
+
+ var titleCaseExceptions = getParameterArray('title_case_minors'),
+ toInclude = getParameterArray('include_to_title_case_minors'),
+ toRuleOut = getParameterArray('rule_out_from_title_case_minors');
+ if (toInclude) {
+ toInclude.forEach((el) => {
+ if (defaultTitleCaseExeptions.indexOf(el) === -1) {
+ defaultTitleCaseExeptions.push(el)
+ }
+ })
+ }
+ if (toRuleOut) {
+ toRuleOut.forEach((el) => {
+ defaultTitleCaseExeptions = defaultTitleCaseExeptions.filter(minor => minor !== el)
+ })
+ }
+ /*
+ * Appending new functions to String.prototype...
+ */
+ String.prototype.toSentenceCase = function () {
+ return this.toLowerCase().replace(/(^\s*\w|[\.\!\?]\s*\w)/g, function (c) {
+ return c.toUpperCase()
+ });
+ }
+ String.prototype.toTitleCase = function () {
+ let tt = (str) => {
+ let s = str.split('.'), w;
+ for (let i in s) {
+ if (!s.hasOwnProperty(i)) {
+ continue;
+ }
+ let w = s[i].split(' '),
+ j = 0;
+
+ if (s[i].trim().replace(/(^\s+|\s+$)/g, "").length > 0) {
+ for (j; j < w.length; j++) {
+ let found = false;
+ for (let k = 0; k < w[j].length; k++) {
+ if (w[j][k].match(/([a-z'áàâãäéèêëíìîïóòôõöúùûü])/i)) {
+ w[j] = w[j][k].toUpperCase() + w[j].slice(k + 1);
+ found = true;
+ break;
+ }
+ }
+ if (found) {
+ break;
+ }
+ }
+ for (j; j < w.length; j++) {
+ if (titleCaseExceptions.indexOf(w[j]) === -1) {
+ for (let k = 0; k < w[j].length; k++) {
+ if (w[j][k].match(/([a-z'áàâãäéèêëíìîïóòôõöúùûü])/i)) {
+ w[j] = w[j][k].toUpperCase() + w[j].slice(k + 1);
+ break;
+ }
+ }
+ }
+ }
+ s[i] = w.join(' ');
+ }
+ }
+ return s.join('.');
+ };
+ return tt(this.toLowerCase());
+ }
+
+ String.prototype.apply = function (method) {
+ switch (method) {
+ case strings.LOWERCASE:
+ return this.toLowerCase();
+ case strings.UPPERCASE:
+ return this.toUpperCase();
+ case strings.SENTENCECASE:
+ return this.toSentenceCase();
+ case strings.TITLECASE:
+ return this.toTitleCase();
+ default:
+ return this;
+ }
+ }
+
+ const handler = function (node, method, r) {
+ if (r.first && r.last) {
+ node.textContent = node.textContent.slice(0, r.startOffset) + node.textContent.slice(r.startOffset, r.endOffset).apply(method) + node.textContent.slice(r.endOffset);
+ } else if (r.first && !r.last) {
+ node.textContent = node.textContent.slice(0, r.startOffset) + node.textContent.slice(r.startOffset).apply(method);
+ } else if (!r.first && r.last) {
+ node.textContent = node.textContent.slice(0, r.endOffset).apply(method) + node.textContent.slice(r.endOffset);
+ } else {
+ node.textContent = node.textContent.apply(method);
+ }
+ }
+
+ const apply = function (method) {
+ let rng = editor.selection.getRng(),
+ bm = editor.selection.getBookmark(2, true),
+ walker = new tinymce.dom.TreeWalker(rng.startContainer),
+ first = rng.startContainer,
+ last = rng.endContainer,
+ startOffset = rng.startOffset,
+ endOffset = rng.endOffset,
+ current = walker.current();
+
+ do {
+ if (current.nodeName === '#text') {
+ handler(current, method, {
+ first: current === first,
+ last: current === last,
+ startOffset: startOffset,
+ endOffset: endOffset
+ });
+ }
+ if (current === last) {
+ break;
+ }
+ current = walker.next();
+ } while (current);
+ editor.save();
+ editor.isNotDirty = true;
+ editor.focus();
+ editor.selection.moveToBookmark(bm);
+ }
+
+ const getMenuItems = function () {
+ return [
+ {
+ type: "menuitem",
+ text: strings.LOWERCASE,
+ //onAction: lowerCase()
+ onAction: () => apply(strings.LOWERCASE)
+ },
+ {
+ type: "menuitem",
+ text: strings.UPPERCASE,
+ //onAction: upperCase()
+ onAction: () => apply(strings.UPPERCASE)
+ },
+ {
+ type: "menuitem",
+ text: strings.SENTENCECASE,
+ //onAction: sentenceCase()
+ onAction: () => apply(strings.SENTENCECASE)
+ },
+ {
+ type: "menuitem",
+ text: strings.TITLECASE,
+ //onAction: titleCase()
+ onAction: () => apply(strings.TITLECASE)
+ }
+ ]
+ }
+
+ const getMenuButton = function () {
+ return {
+ icon: 'change-case',
+ tooltip: strings.TOOLNAME,
+ fetch: function (callback) {
+ const items = getMenuItems();
+ callback(items);
+ }
+ }
+ }
+
+ const getNestedMenuItem = function () {
+ return {
+ text: strings.TOOLNAME,
+ getSubmenuItems: () => {
+ return getMenuItems();
+ }
+ }
+ }
+
+ editor.ui.registry.addMenuButton('case', getMenuButton());
+ editor.ui.registry.addNestedMenuItem('case', getNestedMenuItem());
+
+ editor.addCommand('mceLowerCase', () => apply(strings.LOWERCASE));
+ editor.addCommand('mceUpperCase', () => apply(strings.UPPERCASE));
+ editor.addCommand('mceSentenceCase', () => apply(strings.SENTENCECASE));
+ editor.addCommand('mceTitleCase', () => apply(strings.TITLECASE));
+
+ return {
+ getMetadata: function () {
+ return {
+ name: "Case",
+ url: "https://github.com/melquibrito/Case-change-tinymce-plugin"
+ }
+ }
+ }
+ }
+ );
+})();
diff --git a/ghostwriter/static/js/tinymce/plugins/case/plugin.min.js b/ghostwriter/static/js/tinymce/plugins/case/plugin.min.js
new file mode 100644
index 000000000..2703e35d5
--- /dev/null
+++ b/ghostwriter/static/js/tinymce/plugins/case/plugin.min.js
@@ -0,0 +1,8 @@
+/**
+ * @copyright ©Melqui Brito. All rights reserved.
+ * @author Melqui Brito
+ * @version 1.2.0 (2020-03-08)
+ * @description Tinymce custom plugin for changing text case.
+ */
+
+ !function(){tinymce.PluginManager.add("case",function(t){const e="Change Case",n="lowercase",o="UPPERCASE",s="Sentence case",r="Title Case",i=["at","by","in","of","on","up","to","en","re","vs","but","off","out","via","bar","mid","per","pro","qua","til","from","into","unto","with","amid","anit","atop","down","less","like","near","over","past","plus","sans","save","than","thru","till","upon","for","and","nor","but","or","yet","so","an","a","some","the"],a=function(e){let n=t.getParam(e);if(n){if(Array.isArray(n))return n;if("string"==typeof n)return n.replace(/(\s{1,})/g,"?").trim().split("?")}return"title_case_minors"===e&&i};var c=a("title_case_minors"),l=a("include_to_title_case_minors"),f=a("rule_out_from_title_case_minors");l&&l.forEach(t=>{-1===i.indexOf(t)&&i.push(t)}),f&&f.forEach(t=>{i=i.filter(e=>e!==t)}),String.prototype.toSentenceCase=function(){return this.toLowerCase().replace(/(^\s*\w|[\.\!\?]\s*\w)/g,function(t){return t.toUpperCase()})},String.prototype.toTitleCase=function(){return(t=>{let e=t.split(".");for(let t in e){if(e.hasOwnProperty(t)){let n=e[t].split(" "),o=0;if(e[t].trim().replace(/(^\s+|\s+$)/g,"").length>0){for(;o
m(n)},{type:"menuitem",text:o,onAction:()=>m(o)},{type:"menuitem",text:s,onAction:()=>m(s)},{type:"menuitem",text:r,onAction:()=>m(r)}]};return t.ui.registry.addMenuButton("case",{icon:"change-case",tooltip:e,fetch:function(t){t(p())}}),t.ui.registry.addNestedMenuItem("case",{text:e,getSubmenuItems:()=>p()}),t.addCommand("mceLowerCase",()=>m(n)),t.addCommand("mceUpperCase",()=>m(o)),t.addCommand("mceSentenceCase",()=>m(s)),t.addCommand("mceTitleCase",()=>m(r)),{getMetadata:function(){return{name:"Case",url:"https://github.com/melquibrito/Case-change-tinymce-plugin"}}}})}();
diff --git a/ghostwriter/templates/base_generic.html b/ghostwriter/templates/base_generic.html
index c3b75e769..9ac23e8a6 100644
--- a/ghostwriter/templates/base_generic.html
+++ b/ghostwriter/templates/base_generic.html
@@ -185,7 +185,7 @@
{% comment %} Clients Submenu Items {% endcomment %}
@@ -199,7 +199,7 @@
{% comment %} Findings Submenu Items {% endcomment %}
@@ -287,7 +287,7 @@
{% comment %} Domains Submenu Items {% endcomment %}