mirror of https://github.com/requarks/wiki
Merge 8b5a6ffe44 into 97dd0637e9
Timo Kruth
1 year ago
committed by
GitHub
commit
e5311c6642
@ -1,12 +0,0 @@
|
|||||||
<!-- Wiki.js 1.x? Go to https://github.com/Requarks/wiki-v1/issues -->
|
|
||||||
|
|
||||||
### Actual behavior
|
|
||||||
|
|
||||||
### Expected behavior
|
|
||||||
|
|
||||||
### Steps to reproduce the behavior
|
|
||||||
|
|
||||||
<!-- FOR FEATURE REQUESTS: Use the feature request board instead: https://requests.requarks.io/wiki -->
|
|
||||||
|
|
||||||
<!-- Love Wiki.js? Please consider supporting our collective:
|
|
||||||
👉 https://opencollective.com/wikijs/donate -->
|
|
||||||
@ -0,0 +1,707 @@
|
|||||||
|
<template lang='pug'>
|
||||||
|
.editor-asciidoc
|
||||||
|
v-toolbar.editor-asciidoc-toolbar(dense, color='primary', dark, flat, style='overflow-x: hidden;')
|
||||||
|
template(v-if='isModalShown')
|
||||||
|
v-spacer
|
||||||
|
v-btn.animated.fadeInRight(text, @click='closeAllModal')
|
||||||
|
v-icon(left) mdi-arrow-left-circle
|
||||||
|
span {{$t('editor:backToEditor')}}
|
||||||
|
template(v-else)
|
||||||
|
v-tooltip(bottom, color='primary')
|
||||||
|
template(v-slot:activator='{ on }')
|
||||||
|
v-btn.animated.fadeIn(icon, tile, v-on='on', @click='toggleMarkup({ start: `**` })').mx-0
|
||||||
|
v-icon mdi-format-bold
|
||||||
|
span {{$t('editor:markup.bold')}}
|
||||||
|
v-tooltip(bottom, color='primary')
|
||||||
|
template(v-slot:activator='{ on }')
|
||||||
|
v-btn.animated.fadeIn.wait-p1s(icon, tile, v-on='on', @click='toggleMarkup({ start: `__` })').mx-0
|
||||||
|
v-icon mdi-format-italic
|
||||||
|
span {{$t('editor:markup.italic')}}
|
||||||
|
v-menu(offset-y, open-on-hover)
|
||||||
|
template(v-slot:activator='{ on }')
|
||||||
|
v-btn.animated.fadeIn.wait-p3s(icon, tile, v-on='on').mx-0
|
||||||
|
v-icon mdi-format-header-pound
|
||||||
|
v-list.py-0
|
||||||
|
template(v-for='(n, idx) in 6')
|
||||||
|
v-list-item(@click='setHeaderLine(n)', :key='idx')
|
||||||
|
v-list-item-action
|
||||||
|
v-icon(:size='24 - (idx - 1) * 2') mdi-format-header-{{n}}
|
||||||
|
v-list-item-title {{$t('editor:markup.heading', { level: n })}}
|
||||||
|
v-divider(v-if='idx < 5')
|
||||||
|
v-tooltip(bottom, color='primary')
|
||||||
|
template(v-slot:activator='{ on }')
|
||||||
|
v-btn.animated.fadeIn.wait-p4s(icon, tile, v-on='on', @click='toggleMarkup({ start: `~` })').mx-0
|
||||||
|
v-icon mdi-format-subscript
|
||||||
|
span {{$t('editor:markup.subscript')}}
|
||||||
|
v-tooltip(bottom, color='primary')
|
||||||
|
template(v-slot:activator='{ on }')
|
||||||
|
v-btn.animated.fadeIn.wait-p5s(icon, tile, v-on='on', @click='toggleMarkup({ start: `^` })').mx-0
|
||||||
|
v-icon mdi-format-superscript
|
||||||
|
span {{$t('editor:markup.superscript')}}
|
||||||
|
v-menu(offset-y, open-on-hover)
|
||||||
|
template(v-slot:activator='{ on }')
|
||||||
|
v-btn.animated.fadeIn.wait-p6s(icon, tile, v-on='on').mx-0
|
||||||
|
v-icon mdi-alpha-t-box-outline
|
||||||
|
v-list.py-0
|
||||||
|
v-list-item(@click='insertBeforeEachLine({ content: `> `})')
|
||||||
|
v-list-item-action
|
||||||
|
v-icon mdi-alpha-t-box-outline
|
||||||
|
v-list-item-title {{$t('editor:markup.blockquote')}}
|
||||||
|
v-divider
|
||||||
|
v-list-item(@click='insertBeforeEachLine({ content: `NOTE: `})')
|
||||||
|
v-list-item-action
|
||||||
|
v-icon(color='blue') mdi-alpha-n-box-outline
|
||||||
|
v-list-item-title {{'Note blockquote'}}
|
||||||
|
v-divider
|
||||||
|
v-list-item(@click='insertBeforeEachLine({ content: `TIP: `})')
|
||||||
|
v-list-item-action
|
||||||
|
v-icon(color='success') mdi-alpha-t-box-outline
|
||||||
|
v-list-item-title {{'Tip blockquote'}}
|
||||||
|
v-divider
|
||||||
|
v-list-item(@click='insertBeforeEachLine({ content: `WARNING: `})')
|
||||||
|
v-list-item-action
|
||||||
|
v-icon(color='warning') mdi-alpha-w-box-outline
|
||||||
|
v-list-item-title {{$t('editor:markup.blockquoteWarning')}}
|
||||||
|
v-divider
|
||||||
|
v-list-item(@click='insertBeforeEachLine({ content: `CAUTION: `})')
|
||||||
|
v-list-item-action
|
||||||
|
v-icon(color='purple') mdi-alpha-c-box-outline
|
||||||
|
v-list-item-title {{'Caution blockquote'}}
|
||||||
|
v-list-item(@click='insertBeforeEachLine({ content: `IMPORTANT: `})')
|
||||||
|
v-list-item-action
|
||||||
|
v-icon(color='error') mdi-alpha-i-box-outline
|
||||||
|
v-list-item-title {{'Important blockquote'}}
|
||||||
|
v-divider
|
||||||
|
template(v-if='$vuetify.breakpoint.mdAndUp')
|
||||||
|
v-spacer
|
||||||
|
v-tooltip(bottom, color='primary')
|
||||||
|
template(v-slot:activator='{ on }')
|
||||||
|
v-btn.animated.fadeIn.wait-p2s(icon, tile, v-on='on', @click='previewShown = !previewShown').mx-0
|
||||||
|
v-icon mdi-book-open-outline
|
||||||
|
span {{$t('editor:markup.togglePreviewPane')}}
|
||||||
|
|
||||||
|
.editor-asciidoc-main
|
||||||
|
.editor-asciidoc-sidebar
|
||||||
|
v-tooltip(right, color='teal')
|
||||||
|
template(v-slot:activator='{ on }')
|
||||||
|
v-btn.animated.fadeInLeft(icon, tile, v-on='on', dark, @click='insertLink').mx-0
|
||||||
|
v-icon mdi-link-plus
|
||||||
|
span {{$t('editor:markup.insertLink')}}
|
||||||
|
v-tooltip(right, color='teal')
|
||||||
|
template(v-slot:activator='{ on }')
|
||||||
|
v-btn.mt-3.animated.fadeInLeft.wait-p1s(icon, tile, v-on='on', dark, @click='toggleModal(`editorModalMedia`)').mx-0
|
||||||
|
v-icon(:color='activeModal === `editorModalMedia` ? `teal` : ``') mdi-folder-multiple-image
|
||||||
|
span {{$t('editor:markup.insertAssets')}}
|
||||||
|
v-tooltip(right, color='teal')
|
||||||
|
template(v-slot:activator='{ on }')
|
||||||
|
v-btn.mt-3.animated.fadeInLeft.wait-p5s(icon, tile, v-on='on', dark, @click='toggleModal(`editorModalDrawio`)').mx-0
|
||||||
|
v-icon mdi-chart-multiline
|
||||||
|
span {{$t('editor:markup.insertDiagram')}}
|
||||||
|
template(v-if='$vuetify.breakpoint.mdAndUp')
|
||||||
|
v-spacer
|
||||||
|
v-tooltip(right, color='teal')
|
||||||
|
template(v-slot:activator='{ on }')
|
||||||
|
v-btn.mt-3.animated.fadeInLeft.wait-p8s(icon, tile, v-on='on', dark, @click='toggleFullscreen').mx-0
|
||||||
|
v-icon mdi-arrow-expand-all
|
||||||
|
span {{$t('editor:markup.distractionFreeMode')}}
|
||||||
|
.editor-asciidoc-editor
|
||||||
|
textarea(ref='cm')
|
||||||
|
transition(name='editor-asciidoc-preview')
|
||||||
|
.editor-asciidoc-preview(v-if='previewShown')
|
||||||
|
.editor-asciidoc-preview-content.contents(ref='editorPreviewContainer')
|
||||||
|
div(
|
||||||
|
ref='editorPreview'
|
||||||
|
v-html='previewHTML'
|
||||||
|
)
|
||||||
|
|
||||||
|
v-system-bar.editor-asciidoc-sysbar(dark, status, color='grey darken-3')
|
||||||
|
.caption.editor-asciidoc-sysbar-locale {{locale.toUpperCase()}}
|
||||||
|
.caption.px-3 /{{path}}
|
||||||
|
template(v-if='$vuetify.breakpoint.mdAndUp')
|
||||||
|
v-spacer
|
||||||
|
.caption AsciiDoc
|
||||||
|
v-spacer
|
||||||
|
.caption Ln {{cursorPos.line + 1}}, Col {{cursorPos.ch + 1}}
|
||||||
|
page-selector(mode='select', v-model='insertLinkDialog', :open-handler='insertLinkHandler', :path='path', :locale='locale')
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
import _ from 'lodash'
|
||||||
|
import { get, sync } from 'vuex-pathify'
|
||||||
|
import DOMPurify from 'dompurify'
|
||||||
|
|
||||||
|
// ========================================
|
||||||
|
// IMPORTS
|
||||||
|
// ========================================
|
||||||
|
|
||||||
|
// Code Mirror
|
||||||
|
import CodeMirror from 'codemirror'
|
||||||
|
import 'codemirror/lib/codemirror.css'
|
||||||
|
|
||||||
|
// Language
|
||||||
|
import 'codemirror-asciidoc'
|
||||||
|
|
||||||
|
// Addons
|
||||||
|
import 'codemirror/addon/selection/active-line.js'
|
||||||
|
import 'codemirror/addon/display/fullscreen.js'
|
||||||
|
import 'codemirror/addon/display/fullscreen.css'
|
||||||
|
import 'codemirror/addon/selection/mark-selection.js'
|
||||||
|
import 'codemirror/addon/search/searchcursor.js'
|
||||||
|
import 'codemirror/addon/hint/show-hint.js'
|
||||||
|
import 'codemirror/addon/fold/foldcode.js'
|
||||||
|
import 'codemirror/addon/fold/foldgutter.js'
|
||||||
|
import 'codemirror/addon/fold/foldgutter.css'
|
||||||
|
import cmFold from './common/cmFold'
|
||||||
|
|
||||||
|
// ========================================
|
||||||
|
// INIT
|
||||||
|
// ========================================
|
||||||
|
const asciidoctor = require('asciidoctor')()
|
||||||
|
const cheerio = require('cheerio')
|
||||||
|
|
||||||
|
// Platform detection
|
||||||
|
const CtrlKey = /Mac/.test(navigator.platform) ? 'Cmd' : 'Ctrl'
|
||||||
|
|
||||||
|
// ========================================
|
||||||
|
// HELPER FUNCTIONS
|
||||||
|
// ========================================
|
||||||
|
|
||||||
|
cmFold.register('asciidoc')
|
||||||
|
|
||||||
|
// ========================================
|
||||||
|
// Vue Component
|
||||||
|
// ========================================
|
||||||
|
|
||||||
|
export default {
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
cm: null,
|
||||||
|
cursorPos: { ch: 0, line: 1 },
|
||||||
|
previewShown: true, // TODO
|
||||||
|
insertLinkDialog: false,
|
||||||
|
helpShown: false,
|
||||||
|
previewHTML: ''
|
||||||
|
}
|
||||||
|
},
|
||||||
|
computed: {
|
||||||
|
isMobile() {
|
||||||
|
return this.$vuetify.breakpoint.smAndDown
|
||||||
|
},
|
||||||
|
isModalShown() {
|
||||||
|
return this.helpShown || this.activeModal !== ''
|
||||||
|
},
|
||||||
|
locale: get('page/locale'),
|
||||||
|
path: get('page/path'),
|
||||||
|
mode: get('editor/mode'),
|
||||||
|
activeModal: sync('editor/activeModal')
|
||||||
|
},
|
||||||
|
|
||||||
|
methods: {
|
||||||
|
toggleModal(key) {
|
||||||
|
this.activeModal = (this.activeModal === key) ? '' : key
|
||||||
|
this.helpShown = false
|
||||||
|
},
|
||||||
|
closeAllModal() {
|
||||||
|
this.activeModal = ''
|
||||||
|
this.helpShown = false
|
||||||
|
},
|
||||||
|
onCmInput: _.debounce(function(newContent) {
|
||||||
|
this.processContent(newContent)
|
||||||
|
}, 600),
|
||||||
|
processContent(newContent) {
|
||||||
|
this.processMarkers(this.cm.firstLine(), this.cm.lastLine())
|
||||||
|
let html = asciidoctor.convert(newContent, {
|
||||||
|
standalone: false,
|
||||||
|
safe: 'safe',
|
||||||
|
attributes: {
|
||||||
|
showtitle: true,
|
||||||
|
icons: 'font'
|
||||||
|
}
|
||||||
|
})
|
||||||
|
const $ = cheerio.load(html, {
|
||||||
|
decodeEntities: true
|
||||||
|
})
|
||||||
|
|
||||||
|
$('pre.highlight > code.language-diagram').each((i, elm) => {
|
||||||
|
const diagramContent = Buffer.from($(elm).html(), 'base64').toString()
|
||||||
|
$(elm).parent().replaceWith(`<pre class="diagram">${diagramContent}</div>`)
|
||||||
|
})
|
||||||
|
|
||||||
|
this.previewHTML = DOMPurify.sanitize($.html(), {
|
||||||
|
ADD_TAGS: ['foreignObject']
|
||||||
|
})
|
||||||
|
},
|
||||||
|
/**
|
||||||
|
* Insert content at cursor
|
||||||
|
*/
|
||||||
|
insertAtCursor({ content }) {
|
||||||
|
const cursor = this.cm.doc.getCursor('head')
|
||||||
|
this.cm.doc.replaceRange(content, cursor)
|
||||||
|
},
|
||||||
|
/**
|
||||||
|
* Insert content after current line
|
||||||
|
*/
|
||||||
|
insertAfter({ content, newLine }) {
|
||||||
|
const curLine = this.cm.doc.getCursor('to').line
|
||||||
|
const lineLength = this.cm.doc.getLine(curLine).length
|
||||||
|
this.cm.doc.replaceRange(newLine ? `\n${content}\n` : content, { line: curLine, ch: lineLength + 1 })
|
||||||
|
},
|
||||||
|
/**
|
||||||
|
* Insert content before current line
|
||||||
|
*/
|
||||||
|
insertBeforeEachLine({ content, after }) {
|
||||||
|
let lines = []
|
||||||
|
if (!this.cm.doc.somethingSelected()) {
|
||||||
|
lines.push(this.cm.doc.getCursor('head').line)
|
||||||
|
} else {
|
||||||
|
lines = _.flatten(this.cm.doc.listSelections().map(sl => {
|
||||||
|
const range = Math.abs(sl.anchor.line - sl.head.line) + 1
|
||||||
|
const lowestLine = (sl.anchor.line > sl.head.line) ? sl.head.line : sl.anchor.line
|
||||||
|
return _.times(range, l => l + lowestLine)
|
||||||
|
}))
|
||||||
|
}
|
||||||
|
lines.forEach(ln => {
|
||||||
|
let lineContent = this.cm.doc.getLine(ln)
|
||||||
|
const lineLength = lineContent.length
|
||||||
|
if (_.startsWith(lineContent, content)) {
|
||||||
|
lineContent = lineContent.substring(content.length)
|
||||||
|
}
|
||||||
|
|
||||||
|
this.cm.doc.replaceRange(content + lineContent, { line: ln, ch: 0 }, { line: ln, ch: lineLength })
|
||||||
|
})
|
||||||
|
if (after) {
|
||||||
|
const lastLine = _.last(lines)
|
||||||
|
this.cm.doc.replaceRange(`\n${after}\n`, { line: lastLine, ch: this.cm.doc.getLine(lastLine).length + 1 })
|
||||||
|
}
|
||||||
|
},
|
||||||
|
/**
|
||||||
|
* Update cursor state
|
||||||
|
*/
|
||||||
|
positionSync(cm) {
|
||||||
|
this.cursorPos = cm.getCursor('head')
|
||||||
|
},
|
||||||
|
toggleMarkup({ start, end }) {
|
||||||
|
if (!end) { end = start }
|
||||||
|
if (!this.cm.doc.somethingSelected()) {
|
||||||
|
return this.$store.commit('showNotification', {
|
||||||
|
message: this.$t('editor:markup.noSelectionError'),
|
||||||
|
style: 'warning',
|
||||||
|
icon: 'warning'
|
||||||
|
})
|
||||||
|
}
|
||||||
|
this.cm.doc.replaceSelections(this.cm.doc.getSelections().map(s => start + s + end))
|
||||||
|
},
|
||||||
|
setHeaderLine(lvl) {
|
||||||
|
const curLine = this.cm.doc.getCursor('head').line
|
||||||
|
let lineContent = this.cm.doc.getLine(curLine)
|
||||||
|
const lineLength = lineContent.length
|
||||||
|
if (_.startsWith(lineContent, '=')) {
|
||||||
|
lineContent = lineContent.replace(/^(=+ )/, '')
|
||||||
|
}
|
||||||
|
lineContent = _.times(lvl, n => '=').join('') + ` ` + lineContent
|
||||||
|
this.cm.doc.replaceRange(lineContent, { line: curLine, ch: 0 }, { line: curLine, ch: lineLength })
|
||||||
|
},
|
||||||
|
|
||||||
|
toggleFullscreen () {
|
||||||
|
this.cm.setOption('fullScreen', true)
|
||||||
|
},
|
||||||
|
refresh() {
|
||||||
|
this.$nextTick(() => {
|
||||||
|
this.cm.refresh()
|
||||||
|
})
|
||||||
|
},
|
||||||
|
insertLink () {
|
||||||
|
this.insertLinkDialog = true
|
||||||
|
},
|
||||||
|
insertLinkHandler ({ locale, path }) {
|
||||||
|
const lastPart = _.last(path.split('/'))
|
||||||
|
this.insertAtCursor({
|
||||||
|
content: siteLangs.length > 0 ? `link:/${locale}/${path}[${lastPart}]` : `link:/${path}[${lastPart}]`
|
||||||
|
})
|
||||||
|
},
|
||||||
|
processMarkers (from, to) {
|
||||||
|
let found = null
|
||||||
|
let foundStart = 0
|
||||||
|
this.cm.doc.getAllMarks().forEach(mk => {
|
||||||
|
if (mk.__kind) {
|
||||||
|
mk.clear()
|
||||||
|
}
|
||||||
|
})
|
||||||
|
this.cm.eachLine(from, to, ln => {
|
||||||
|
const line = ln.lineNo()
|
||||||
|
if (ln.text.startsWith('```diagram')) {
|
||||||
|
found = 'diagram'
|
||||||
|
foundStart = line
|
||||||
|
} else if (ln.text === '```' && found) {
|
||||||
|
switch (found) {
|
||||||
|
// ------------------------------
|
||||||
|
// -> DIAGRAM
|
||||||
|
// ------------------------------
|
||||||
|
case 'diagram': {
|
||||||
|
if (line - foundStart !== 2) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
this.addMarker({
|
||||||
|
kind: 'diagram',
|
||||||
|
from: { line: foundStart, ch: 3 },
|
||||||
|
to: { line: foundStart, ch: 10 },
|
||||||
|
text: 'Edit Diagram',
|
||||||
|
action: ((start, end) => {
|
||||||
|
return (ev) => {
|
||||||
|
this.cm.doc.setSelection({ line: start, ch: 0 }, { line: end, ch: 3 })
|
||||||
|
try {
|
||||||
|
const raw = this.cm.doc.getLine(end - 1)
|
||||||
|
this.$store.set('editor/activeModalData', Buffer.from(raw, 'base64').toString())
|
||||||
|
this.toggleModal(`editorModalDrawio`)
|
||||||
|
} catch (err) {
|
||||||
|
return this.$store.commit('showNotification', {
|
||||||
|
message: 'Failed to process diagram data.',
|
||||||
|
style: 'warning',
|
||||||
|
icon: 'warning'
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})(foundStart, line)
|
||||||
|
})
|
||||||
|
if (ln.height > 0) {
|
||||||
|
this.cm.foldCode(foundStart)
|
||||||
|
}
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
found = null
|
||||||
|
}
|
||||||
|
})
|
||||||
|
},
|
||||||
|
addMarker ({ kind, from, to, text, action }) {
|
||||||
|
const markerElm = document.createElement('span')
|
||||||
|
markerElm.appendChild(document.createTextNode(text))
|
||||||
|
markerElm.className = 'CodeMirror-buttonmarker'
|
||||||
|
markerElm.addEventListener('click', action)
|
||||||
|
this.cm.markText(from, to, { replacedWith: markerElm, __kind: kind })
|
||||||
|
}
|
||||||
|
},
|
||||||
|
mounted() {
|
||||||
|
this.$store.set('editor/editorKey', 'asciidoc')
|
||||||
|
|
||||||
|
if (this.mode === 'create') {
|
||||||
|
this.$store.set('editor/content', '== header\n\ncontent')
|
||||||
|
}
|
||||||
|
|
||||||
|
// Initialize CodeMirror
|
||||||
|
|
||||||
|
this.cm = CodeMirror.fromTextArea(this.$refs.cm, {
|
||||||
|
tabSize: 2,
|
||||||
|
mode: 'asciidoc',
|
||||||
|
theme: 'wikijs-dark',
|
||||||
|
lineNumbers: true,
|
||||||
|
lineWrapping: true,
|
||||||
|
line: true,
|
||||||
|
styleActiveLine: true,
|
||||||
|
highlightSelectionMatches: {
|
||||||
|
annotateScrollbar: true
|
||||||
|
},
|
||||||
|
viewportMargin: 50,
|
||||||
|
inputStyle: 'contenteditable',
|
||||||
|
allowDropFileTypes: ['image/jpg', 'image/png', 'image/svg', 'image/jpeg', 'image/gif'],
|
||||||
|
direction: siteConfig.rtl ? 'rtl' : 'ltr',
|
||||||
|
foldGutter: true,
|
||||||
|
gutters: ['CodeMirror-linenumbers', 'CodeMirror-foldgutter']
|
||||||
|
|
||||||
|
})
|
||||||
|
this.cm.setValue(this.$store.get('editor/content'))
|
||||||
|
this.cm.on('change', c => {
|
||||||
|
this.$store.set('editor/content', c.getValue())
|
||||||
|
this.onCmInput(this.$store.get('editor/content'))
|
||||||
|
})
|
||||||
|
if (this.$vuetify.breakpoint.mdAndUp) {
|
||||||
|
this.cm.setSize(null, 'calc(100vh - 137px)')
|
||||||
|
} else {
|
||||||
|
this.cm.setSize(null, 'calc(100vh - 112px - 16px)')
|
||||||
|
}
|
||||||
|
|
||||||
|
// Set Keybindings
|
||||||
|
|
||||||
|
const keyBindings = {
|
||||||
|
'F11' (c) {
|
||||||
|
c.setOption('fullScreen', !c.getOption('fullScreen'))
|
||||||
|
},
|
||||||
|
'Esc' (c) {
|
||||||
|
if (c.getOption('fullScreen')) c.setOption('fullScreen', false)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
_.set(keyBindings, `${CtrlKey}-B`, c => {
|
||||||
|
this.toggleMarkup({ start: `**` })
|
||||||
|
return false
|
||||||
|
})
|
||||||
|
_.set(keyBindings, `${CtrlKey}-I`, c => {
|
||||||
|
this.toggleMarkup({ start: `__` })
|
||||||
|
return false
|
||||||
|
})
|
||||||
|
|
||||||
|
this.cm.setOption('extraKeys', keyBindings)
|
||||||
|
|
||||||
|
// Handle cursor movement
|
||||||
|
|
||||||
|
this.cm.on('cursorActivity', c => {
|
||||||
|
this.positionSync(c)
|
||||||
|
})
|
||||||
|
|
||||||
|
// Render initial preview
|
||||||
|
this.processContent(this.$store.get('editor/content'))
|
||||||
|
|
||||||
|
this.$root.$on('editorInsert', opts => {
|
||||||
|
switch (opts.kind) {
|
||||||
|
case 'IMAGE':
|
||||||
|
let img = `image::${opts.path}[${opts.text}]`
|
||||||
|
this.insertAtCursor({
|
||||||
|
content: img
|
||||||
|
})
|
||||||
|
break
|
||||||
|
case 'BINARY':
|
||||||
|
this.insertAtCursor({
|
||||||
|
content: `link:${opts.path}[${opts.text}]`
|
||||||
|
})
|
||||||
|
break
|
||||||
|
case 'DIAGRAM':
|
||||||
|
const selStartLine = this.cm.getCursor('from').line
|
||||||
|
const selEndLine = this.cm.getCursor('to').line + 1
|
||||||
|
this.cm.doc.replaceSelection('```diagram\n' + opts.text + '\n```\n', 'start')
|
||||||
|
this.processMarkers(selStartLine, selEndLine)
|
||||||
|
break
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
// Handle save conflict
|
||||||
|
this.$root.$on('saveConflict', () => {
|
||||||
|
this.toggleModal(`editorModalConflict`)
|
||||||
|
})
|
||||||
|
this.$root.$on('overwriteEditorContent', () => {
|
||||||
|
this.cm.setValue(this.$store.get('editor/content'))
|
||||||
|
})
|
||||||
|
},
|
||||||
|
beforeDestroy() {
|
||||||
|
this.$root.$off('editorInsert')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style lang='scss'>
|
||||||
|
$editor-ascii-height: calc(100vh - 137px);
|
||||||
|
$editor-ascii-height-mobile: calc(100vh - 112px - 16px);
|
||||||
|
|
||||||
|
.editor-asciidoc {
|
||||||
|
&-main {
|
||||||
|
display: flex;
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
&-editor {
|
||||||
|
background-color: darken(mc('grey', '900'), 4.5%);
|
||||||
|
flex: 1 1 50%;
|
||||||
|
display: block;
|
||||||
|
height: $editor-ascii-height;
|
||||||
|
position: relative;
|
||||||
|
|
||||||
|
@include until($tablet) {
|
||||||
|
height: $editor-ascii-height-mobile;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
&-preview {
|
||||||
|
flex: 1 1 50%;
|
||||||
|
background-color: mc('grey', '100');
|
||||||
|
position: relative;
|
||||||
|
height: $editor-ascii-height;
|
||||||
|
overflow: hidden;
|
||||||
|
padding: 1rem;
|
||||||
|
|
||||||
|
@at-root .theme--dark & {
|
||||||
|
background-color: mc('grey', '900');
|
||||||
|
}
|
||||||
|
|
||||||
|
@include until($tablet) {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
&-enter-active, &-leave-active {
|
||||||
|
transition: max-width .5s ease;
|
||||||
|
max-width: 50vw;
|
||||||
|
|
||||||
|
.editor-code-preview-content {
|
||||||
|
width: 50vw;
|
||||||
|
overflow:hidden;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
&-enter, &-leave-to {
|
||||||
|
max-width: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
&-content {
|
||||||
|
height: $editor-ascii-height;
|
||||||
|
overflow-y: scroll;
|
||||||
|
padding: 0;
|
||||||
|
width: calc(100% + 17px);
|
||||||
|
// -ms-overflow-style: none;
|
||||||
|
|
||||||
|
// &::-webkit-scrollbar {
|
||||||
|
// width: 0px;
|
||||||
|
// background: transparent;
|
||||||
|
// }
|
||||||
|
|
||||||
|
@include until($tablet) {
|
||||||
|
height: $editor-ascii-height-mobile;
|
||||||
|
}
|
||||||
|
|
||||||
|
> div {
|
||||||
|
outline: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
p.line {
|
||||||
|
overflow-wrap: break-word;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tabset {
|
||||||
|
background-color: mc('teal', '700');
|
||||||
|
color: mc('teal', '100') !important;
|
||||||
|
padding: 5px 12px;
|
||||||
|
font-size: 14px;
|
||||||
|
font-weight: 500;
|
||||||
|
border-radius: 5px 0 0 0;
|
||||||
|
font-style: italic;
|
||||||
|
|
||||||
|
&::after {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
&-header {
|
||||||
|
background-color: mc('teal', '500');
|
||||||
|
color: #FFF !important;
|
||||||
|
padding: 5px 12px;
|
||||||
|
font-size: 14px;
|
||||||
|
font-weight: 500;
|
||||||
|
margin-top: 0 !important;
|
||||||
|
|
||||||
|
&::after {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
&-content {
|
||||||
|
border-left: 5px solid mc('teal', '500');
|
||||||
|
background-color: mc('teal', '50');
|
||||||
|
padding: 0 15px 15px;
|
||||||
|
overflow: hidden;
|
||||||
|
|
||||||
|
@at-root .theme--dark & {
|
||||||
|
background-color: rgba(mc('teal', '500'), .1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
&-toolbar {
|
||||||
|
background-color: mc('blue', '700');
|
||||||
|
background-image: linear-gradient(to bottom, mc('blue', '700') 0%, mc('blue','800') 100%);
|
||||||
|
color: #FFF;
|
||||||
|
|
||||||
|
.v-toolbar__content {
|
||||||
|
padding-left: 64px;
|
||||||
|
|
||||||
|
@include until($tablet) {
|
||||||
|
padding-left: 8px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
&-insert:not(.v-speed-dial--right) {
|
||||||
|
@include from($tablet) {
|
||||||
|
left: 50%;
|
||||||
|
margin-left: -28px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
&-sidebar {
|
||||||
|
background-color: mc('grey', '900');
|
||||||
|
width: 64px;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
justify-content: flex-start;
|
||||||
|
align-items: center;
|
||||||
|
padding: 24px 0;
|
||||||
|
|
||||||
|
@include until($tablet) {
|
||||||
|
padding: 12px 0;
|
||||||
|
width: 40px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
&-sysbar {
|
||||||
|
padding-left: 0;
|
||||||
|
|
||||||
|
&-locale {
|
||||||
|
background-color: rgba(255,255,255,.25);
|
||||||
|
display:inline-flex;
|
||||||
|
padding: 0 12px;
|
||||||
|
height: 24px;
|
||||||
|
width: 63px;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ==========================================
|
||||||
|
// Fix FAB revealing under codemirror
|
||||||
|
// ==========================================
|
||||||
|
|
||||||
|
.speed-dial--fixed {
|
||||||
|
z-index: 8;
|
||||||
|
}
|
||||||
|
|
||||||
|
// ==========================================
|
||||||
|
// CODE MIRROR
|
||||||
|
// ==========================================
|
||||||
|
|
||||||
|
.CodeMirror {
|
||||||
|
height: auto;
|
||||||
|
font-family: 'Roboto Mono', monospace;
|
||||||
|
font-size: .9rem;
|
||||||
|
|
||||||
|
.cm-header-1 {
|
||||||
|
font-size: 1.5rem;
|
||||||
|
}
|
||||||
|
.cm-header-2 {
|
||||||
|
font-size: 1.25rem;
|
||||||
|
}
|
||||||
|
.cm-header-3 {
|
||||||
|
font-size: 1.15rem;
|
||||||
|
}
|
||||||
|
.cm-header-4 {
|
||||||
|
font-size: 1.1rem;
|
||||||
|
}
|
||||||
|
.cm-header-5 {
|
||||||
|
font-size: 1.05rem;
|
||||||
|
}
|
||||||
|
.cm-header-6 {
|
||||||
|
font-size: 1.025rem;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.CodeMirror-wrap pre.CodeMirror-line, .CodeMirror-wrap pre.CodeMirror-line-like {
|
||||||
|
word-break: break-word;
|
||||||
|
}
|
||||||
|
|
||||||
|
.CodeMirror-focused .cm-matchhighlight {
|
||||||
|
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAYAAABytg0kAAAAFklEQVQI12NgYGBgkKzc8x9CMDAwAAAmhwSbidEoSQAAAABJRU5ErkJggg==);
|
||||||
|
background-position: bottom;
|
||||||
|
background-repeat: repeat-x;
|
||||||
|
}
|
||||||
|
.cm-matchhighlight {
|
||||||
|
background-color: mc('grey', '800');
|
||||||
|
}
|
||||||
|
.CodeMirror-selection-highlight-scrollbar {
|
||||||
|
background-color: mc('green', '600');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
After Width: | Height: | Size: 1.0 KiB |
@ -0,0 +1,628 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# DigitalOcean Marketplace Image Validation Tool
|
||||||
|
# © 2021-2022 DigitalOcean LLC.
|
||||||
|
# This code is licensed under Apache 2.0 license (see LICENSE.md for details)
|
||||||
|
|
||||||
|
VERSION="v. 1.8"
|
||||||
|
RUNDATE=$( date )
|
||||||
|
|
||||||
|
# Script should be run with SUDO
|
||||||
|
if [ "$EUID" -ne 0 ]
|
||||||
|
then echo "[Error] - This script must be run with sudo or as the root user."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
STATUS=0
|
||||||
|
PASS=0
|
||||||
|
WARN=0
|
||||||
|
FAIL=0
|
||||||
|
|
||||||
|
# $1 == command to check for
|
||||||
|
# returns: 0 == true, 1 == false
|
||||||
|
cmdExists() {
|
||||||
|
if command -v "$1" > /dev/null 2>&1; then
|
||||||
|
return 0
|
||||||
|
else
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
function getDistro {
|
||||||
|
if [ -f /etc/os-release ]; then
|
||||||
|
# freedesktop.org and systemd
|
||||||
|
# shellcheck disable=SC1091
|
||||||
|
. /etc/os-release
|
||||||
|
OS=$NAME
|
||||||
|
VER=$VERSION_ID
|
||||||
|
elif type lsb_release >/dev/null 2>&1; then
|
||||||
|
# linuxbase.org
|
||||||
|
OS=$(lsb_release -si)
|
||||||
|
VER=$(lsb_release -sr)
|
||||||
|
elif [ -f /etc/lsb-release ]; then
|
||||||
|
# For some versions of Debian/Ubuntu without lsb_release command
|
||||||
|
# shellcheck disable=SC1091
|
||||||
|
. /etc/lsb-release
|
||||||
|
OS=$DISTRIB_ID
|
||||||
|
VER=$DISTRIB_RELEASE
|
||||||
|
elif [ -f /etc/debian_version ]; then
|
||||||
|
# Older Debian/Ubuntu/etc.
|
||||||
|
OS=Debian
|
||||||
|
VER=$(cat /etc/debian_version)
|
||||||
|
elif [ -f /etc/SuSe-release ]; then
|
||||||
|
# Older SuSE/etc.
|
||||||
|
:
|
||||||
|
elif [ -f /etc/redhat-release ]; then
|
||||||
|
# Older Red Hat, CentOS, etc.
|
||||||
|
VER=$(cut -d" " -f3 < /etc/redhat-release | cut -d "." -f1)
|
||||||
|
d=$(cut -d" " -f1 < /etc/redhat-release | cut -d "." -f1)
|
||||||
|
if [[ $d == "CentOS" ]]; then
|
||||||
|
OS="CentOS Linux"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
# Fall back to uname, e.g. "Linux <version>", also works for BSD, etc.
|
||||||
|
OS=$(uname -s)
|
||||||
|
VER=$(uname -r)
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
function loadPasswords {
|
||||||
|
SHADOW=$(cat /etc/shadow)
|
||||||
|
}
|
||||||
|
|
||||||
|
function checkAgent {
|
||||||
|
# Check for the presence of the DO directory in the filesystem
|
||||||
|
if [ -d /opt/digitalocean ];then
|
||||||
|
echo -en "\e[41m[FAIL]\e[0m DigitalOcean directory detected.\n"
|
||||||
|
((FAIL++))
|
||||||
|
STATUS=2
|
||||||
|
if [[ $OS == "CentOS Linux" ]] || [[ $OS == "CentOS Stream" ]] || [[ $OS == "Rocky Linux" ]]; then
|
||||||
|
echo "To uninstall the agent: 'sudo yum remove droplet-agent'"
|
||||||
|
echo "To remove the DO directory: 'find /opt/digitalocean/ -type d -empty -delete'"
|
||||||
|
elif [[ $OS == "Ubuntu" ]] || [[ $OS == "Debian" ]]; then
|
||||||
|
echo "To uninstall the agent and remove the DO directory: 'sudo apt-get purge droplet-agent'"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
echo -en "\e[32m[PASS]\e[0m DigitalOcean Monitoring agent was not found\n"
|
||||||
|
((PASS++))
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
function checkLogs {
|
||||||
|
cp_ignore="/var/log/cpanel-install.log"
|
||||||
|
echo -en "\nChecking for log files in /var/log\n\n"
|
||||||
|
# Check if there are log archives or log files that have not been recently cleared.
|
||||||
|
for f in /var/log/*-????????; do
|
||||||
|
[[ -e $f ]] || break
|
||||||
|
if [ "${f}" != "${cp_ignore}" ]; then
|
||||||
|
echo -en "\e[93m[WARN]\e[0m Log archive ${f} found; Contents:\n"
|
||||||
|
cat "${f}"
|
||||||
|
((WARN++))
|
||||||
|
if [[ $STATUS != 2 ]]; then
|
||||||
|
STATUS=1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
for f in /var/log/*.[0-9];do
|
||||||
|
[[ -e $f ]] || break
|
||||||
|
echo -en "\e[93m[WARN]\e[0m Log archive ${f} found; Contents:\n"
|
||||||
|
cat "${f}"
|
||||||
|
((WARN++))
|
||||||
|
if [[ $STATUS != 2 ]]; then
|
||||||
|
STATUS=1
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
for f in /var/log/*.log; do
|
||||||
|
[[ -e $f ]] || break
|
||||||
|
if [[ "${f}" = '/var/log/lfd.log' && "$(grep -E -v '/var/log/messages has been reset| Watching /var/log/messages' "${f}" | wc -c)" -gt 50 ]]; then
|
||||||
|
if [ "${f}" != "${cp_ignore}" ]; then
|
||||||
|
echo -en "\e[93m[WARN]\e[0m un-cleared log file, ${f} found; Contents:\n"
|
||||||
|
cat "${f}"
|
||||||
|
((WARN++))
|
||||||
|
if [[ $STATUS != 2 ]]; then
|
||||||
|
STATUS=1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
elif [[ "${f}" != '/var/log/lfd.log' && "$(wc -c < "${f}")" -gt 50 ]]; then
|
||||||
|
if [ "${f}" != "${cp_ignore}" ]; then
|
||||||
|
echo -en "\e[93m[WARN]\e[0m un-cleared log file, ${f} found; Contents:\n"
|
||||||
|
cat "${f}"
|
||||||
|
((WARN++))
|
||||||
|
if [[ $STATUS != 2 ]]; then
|
||||||
|
STATUS=1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
}
|
||||||
|
function checkTMP {
|
||||||
|
# Check the /tmp directory to ensure it is empty. Warn on any files found.
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
function checkRoot {
|
||||||
|
user="root"
|
||||||
|
uhome="/root"
|
||||||
|
for usr in $SHADOW
|
||||||
|
do
|
||||||
|
IFS=':' read -r -a u <<< "$usr"
|
||||||
|
if [[ "${u[0]}" == "${user}" ]]; then
|
||||||
|
if [[ ${u[1]} == "!" ]] || [[ ${u[1]} == "!!" ]] || [[ ${u[1]} == "*" ]]; then
|
||||||
|
echo -en "\e[32m[PASS]\e[0m User ${user} has no password set.\n"
|
||||||
|
((PASS++))
|
||||||
|
else
|
||||||
|
echo -en "\e[41m[FAIL]\e[0m User ${user} has a password set on their account.\n"
|
||||||
|
((FAIL++))
|
||||||
|
STATUS=2
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
if [ -d ${uhome}/ ]; then
|
||||||
|
if [ -d ${uhome}/.ssh/ ]; then
|
||||||
|
if ls ${uhome}/.ssh/*> /dev/null 2>&1; then
|
||||||
|
for key in "${uhome}"/.ssh/*
|
||||||
|
do
|
||||||
|
if [ "${key}" == "${uhome}/.ssh/authorized_keys" ]; then
|
||||||
|
|
||||||
|
if [ "$(wc -c < "${key}")" -gt 50 ]; then
|
||||||
|
echo -en "\e[41m[FAIL]\e[0m User \e[1m${user}\e[0m has a populated authorized_keys file in \e[93m${key}\e[0m\n"
|
||||||
|
akey=$(cat "${key}")
|
||||||
|
echo "File Contents:"
|
||||||
|
echo "$akey"
|
||||||
|
echo "--------------"
|
||||||
|
((FAIL++))
|
||||||
|
STATUS=2
|
||||||
|
fi
|
||||||
|
elif [ "${key}" == "${uhome}/.ssh/id_rsa" ]; then
|
||||||
|
if [ "$(wc -c < "${key}")" -gt 0 ]; then
|
||||||
|
echo -en "\e[41m[FAIL]\e[0m User \e[1m${user}\e[0m has a private key file in \e[93m${key}\e[0m\n"
|
||||||
|
akey=$(cat "${key}")
|
||||||
|
echo "File Contents:"
|
||||||
|
echo "$akey"
|
||||||
|
echo "--------------"
|
||||||
|
((FAIL++))
|
||||||
|
STATUS=2
|
||||||
|
else
|
||||||
|
echo -en "\e[93m[WARN]\e[0m User \e[1m${user}\e[0m has empty private key file in \e[93m${key}\e[0m\n"
|
||||||
|
((WARN++))
|
||||||
|
if [[ $STATUS != 2 ]]; then
|
||||||
|
STATUS=1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
elif [ "${key}" != "${uhome}/.ssh/known_hosts" ]; then
|
||||||
|
echo -en "\e[93m[WARN]\e[0m User \e[1m${user}\e[0m has a file in their .ssh directory at \e[93m${key}\e[0m\n"
|
||||||
|
((WARN++))
|
||||||
|
if [[ $STATUS != 2 ]]; then
|
||||||
|
STATUS=1
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
if [ "$(wc -c < "${key}")" -gt 50 ]; then
|
||||||
|
echo -en "\e[93m[WARN]\e[0m User \e[1m${user}\e[0m has a populated known_hosts file in \e[93m${key}\e[0m\n"
|
||||||
|
((WARN++))
|
||||||
|
if [[ $STATUS != 2 ]]; then
|
||||||
|
STATUS=1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
else
|
||||||
|
echo -en "\e[32m[ OK ]\e[0m User \e[1m${user}\e[0m has no SSH keys present\n"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
echo -en "\e[32m[ OK ]\e[0m User \e[1m${user}\e[0m does not have an .ssh directory\n"
|
||||||
|
fi
|
||||||
|
if [ -f /root/.bash_history ];then
|
||||||
|
|
||||||
|
BH_S=$(wc -c < /root/.bash_history)
|
||||||
|
|
||||||
|
if [[ $BH_S -lt 200 ]]; then
|
||||||
|
echo -en "\e[32m[PASS]\e[0m ${user}'s Bash History appears to have been cleared\n"
|
||||||
|
((PASS++))
|
||||||
|
else
|
||||||
|
echo -en "\e[41m[FAIL]\e[0m ${user}'s Bash History should be cleared to prevent sensitive information from leaking\n"
|
||||||
|
((FAIL++))
|
||||||
|
STATUS=2
|
||||||
|
fi
|
||||||
|
|
||||||
|
return 1;
|
||||||
|
else
|
||||||
|
echo -en "\e[32m[PASS]\e[0m The Root User's Bash History is not present\n"
|
||||||
|
((PASS++))
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
echo -en "\e[32m[ OK ]\e[0m User \e[1m${user}\e[0m does not have a directory in /home\n"
|
||||||
|
fi
|
||||||
|
echo -en "\n\n"
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
|
||||||
|
function checkUsers {
|
||||||
|
# Check each user-created account
|
||||||
|
awk -F: '$3 >= 1000 && $1 != "nobody" {print $1}' < /etc/passwd | while IFS= read -r user;
|
||||||
|
do
|
||||||
|
# Skip some other non-user system accounts
|
||||||
|
if [[ $user == "centos" ]]; then
|
||||||
|
:
|
||||||
|
elif [[ $user == "nfsnobody" ]]; then
|
||||||
|
:
|
||||||
|
else
|
||||||
|
echo -en "\nChecking user: ${user}...\n"
|
||||||
|
for usr in $SHADOW
|
||||||
|
do
|
||||||
|
IFS=':' read -r -a u <<< "$usr"
|
||||||
|
if [[ "${u[0]}" == "${user}" ]]; then
|
||||||
|
if [[ ${u[1]} == "!" ]] || [[ ${u[1]} == "!!" ]] || [[ ${u[1]} == "*" ]]; then
|
||||||
|
echo -en "\e[32m[PASS]\e[0m User ${user} has no password set.\n"
|
||||||
|
# shellcheck disable=SC2030
|
||||||
|
((PASS++))
|
||||||
|
else
|
||||||
|
echo -en "\e[41m[FAIL]\e[0m User ${user} has a password set on their account. Only system users are allowed on the image.\n"
|
||||||
|
# shellcheck disable=SC2030
|
||||||
|
((FAIL++))
|
||||||
|
STATUS=2
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
#echo "User Found: ${user}"
|
||||||
|
uhome="/home/${user}"
|
||||||
|
if [ -d "${uhome}/" ]; then
|
||||||
|
if [ -d "${uhome}/.ssh/" ]; then
|
||||||
|
if ls "${uhome}/.ssh/*"> /dev/null 2>&1; then
|
||||||
|
for key in "${uhome}"/.ssh/*
|
||||||
|
do
|
||||||
|
if [ "${key}" == "${uhome}/.ssh/authorized_keys" ]; then
|
||||||
|
if [ "$(wc -c < "${key}")" -gt 50 ]; then
|
||||||
|
echo -en "\e[41m[FAIL]\e[0m User \e[1m${user}\e[0m has a populated authorized_keys file in \e[93m${key}\e[0m\n"
|
||||||
|
akey=$(cat "${key}")
|
||||||
|
echo "File Contents:"
|
||||||
|
echo "$akey"
|
||||||
|
echo "--------------"
|
||||||
|
((FAIL++))
|
||||||
|
STATUS=2
|
||||||
|
fi
|
||||||
|
elif [ "${key}" == "${uhome}/.ssh/id_rsa" ]; then
|
||||||
|
if [ "$(wc -c < "${key}")" -gt 0 ]; then
|
||||||
|
echo -en "\e[41m[FAIL]\e[0m User \e[1m${user}\e[0m has a private key file in \e[93m${key}\e[0m\n"
|
||||||
|
akey=$(cat "${key}")
|
||||||
|
echo "File Contents:"
|
||||||
|
echo "$akey"
|
||||||
|
echo "--------------"
|
||||||
|
((FAIL++))
|
||||||
|
STATUS=2
|
||||||
|
else
|
||||||
|
echo -en "\e[93m[WARN]\e[0m User \e[1m${user}\e[0m has empty private key file in \e[93m${key}\e[0m\n"
|
||||||
|
# shellcheck disable=SC2030
|
||||||
|
((WARN++))
|
||||||
|
if [[ $STATUS != 2 ]]; then
|
||||||
|
STATUS=1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
elif [ "${key}" != "${uhome}/.ssh/known_hosts" ]; then
|
||||||
|
|
||||||
|
echo -en "\e[93m[WARN]\e[0m User \e[1m${user}\e[0m has a file in their .ssh directory named \e[93m${key}\e[0m\n"
|
||||||
|
((WARN++))
|
||||||
|
if [[ $STATUS != 2 ]]; then
|
||||||
|
STATUS=1
|
||||||
|
fi
|
||||||
|
|
||||||
|
else
|
||||||
|
if [ "$(wc -c < "${key}")" -gt 50 ]; then
|
||||||
|
echo -en "\e[93m[WARN]\e[0m User \e[1m${user}\e[0m has a known_hosts file in \e[93m${key}\e[0m\n"
|
||||||
|
((WARN++))
|
||||||
|
if [[ $STATUS != 2 ]]; then
|
||||||
|
STATUS=1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
done
|
||||||
|
else
|
||||||
|
echo -en "\e[32m[ OK ]\e[0m User \e[1m${user}\e[0m has no SSH keys present\n"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
echo -en "\e[32m[ OK ]\e[0m User \e[1m${user}\e[0m does not have an .ssh directory\n"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
echo -en "\e[32m[ OK ]\e[0m User \e[1m${user}\e[0m does not have a directory in /home\n"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Check for an uncleared .bash_history for this user
|
||||||
|
if [ -f "${uhome}/.bash_history" ]; then
|
||||||
|
BH_S=$(wc -c < "${uhome}/.bash_history")
|
||||||
|
|
||||||
|
if [[ $BH_S -lt 200 ]]; then
|
||||||
|
echo -en "\e[32m[PASS]\e[0m ${user}'s Bash History appears to have been cleared\n"
|
||||||
|
((PASS++))
|
||||||
|
else
|
||||||
|
echo -en "\e[41m[FAIL]\e[0m ${user}'s Bash History should be cleared to prevent sensitive information from leaking\n"
|
||||||
|
((FAIL++))
|
||||||
|
STATUS=2
|
||||||
|
|
||||||
|
fi
|
||||||
|
echo -en "\n\n"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
}
|
||||||
|
function checkFirewall {
|
||||||
|
|
||||||
|
if [[ $OS == "Ubuntu" ]]; then
|
||||||
|
fw="ufw"
|
||||||
|
ufwa=$(ufw status |head -1| sed -e "s/^Status:\ //")
|
||||||
|
if [[ $ufwa == "active" ]]; then
|
||||||
|
FW_VER="\e[32m[PASS]\e[0m Firewall service (${fw}) is active\n"
|
||||||
|
# shellcheck disable=SC2031
|
||||||
|
((PASS++))
|
||||||
|
else
|
||||||
|
FW_VER="\e[93m[WARN]\e[0m No firewall is configured. Ensure ${fw} is installed and configured\n"
|
||||||
|
# shellcheck disable=SC2031
|
||||||
|
((WARN++))
|
||||||
|
fi
|
||||||
|
elif [[ $OS == "CentOS Linux" ]] || [[ $OS == "CentOS Stream" ]] || [[ $OS == "Rocky Linux" ]]; then
|
||||||
|
if [ -f /usr/lib/systemd/system/csf.service ]; then
|
||||||
|
fw="csf"
|
||||||
|
if [[ $(systemctl status $fw >/dev/null 2>&1) ]]; then
|
||||||
|
|
||||||
|
FW_VER="\e[32m[PASS]\e[0m Firewall service (${fw}) is active\n"
|
||||||
|
((PASS++))
|
||||||
|
elif cmdExists "firewall-cmd"; then
|
||||||
|
if [[ $(systemctl is-active firewalld >/dev/null 2>&1 && echo 1 || echo 0) ]]; then
|
||||||
|
FW_VER="\e[32m[PASS]\e[0m Firewall service (${fw}) is active\n"
|
||||||
|
((PASS++))
|
||||||
|
else
|
||||||
|
FW_VER="\e[93m[WARN]\e[0m No firewall is configured. Ensure ${fw} is installed and configured\n"
|
||||||
|
((WARN++))
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
FW_VER="\e[93m[WARN]\e[0m No firewall is configured. Ensure ${fw} is installed and configured\n"
|
||||||
|
((WARN++))
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
fw="firewalld"
|
||||||
|
if [[ $(systemctl is-active firewalld >/dev/null 2>&1 && echo 1 || echo 0) ]]; then
|
||||||
|
FW_VER="\e[32m[PASS]\e[0m Firewall service (${fw}) is active\n"
|
||||||
|
((PASS++))
|
||||||
|
else
|
||||||
|
FW_VER="\e[93m[WARN]\e[0m No firewall is configured. Ensure ${fw} is installed and configured\n"
|
||||||
|
((WARN++))
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
elif [[ "$OS" =~ Debian.* ]]; then
|
||||||
|
# user could be using a number of different services for managing their firewall
|
||||||
|
# we will check some of the most common
|
||||||
|
if cmdExists 'ufw'; then
|
||||||
|
fw="ufw"
|
||||||
|
ufwa=$(ufw status |head -1| sed -e "s/^Status:\ //")
|
||||||
|
if [[ $ufwa == "active" ]]; then
|
||||||
|
FW_VER="\e[32m[PASS]\e[0m Firewall service (${fw}) is active\n"
|
||||||
|
((PASS++))
|
||||||
|
else
|
||||||
|
FW_VER="\e[93m[WARN]\e[0m No firewall is configured. Ensure ${fw} is installed and configured\n"
|
||||||
|
((WARN++))
|
||||||
|
fi
|
||||||
|
elif cmdExists "firewall-cmd"; then
|
||||||
|
fw="firewalld"
|
||||||
|
if [[ $(systemctl is-active --quiet $fw) ]]; then
|
||||||
|
FW_VER="\e[32m[PASS]\e[0m Firewall service (${fw}) is active\n"
|
||||||
|
((PASS++))
|
||||||
|
else
|
||||||
|
FW_VER="\e[93m[WARN]\e[0m No firewall is configured. Ensure ${fw} is installed and configured\n"
|
||||||
|
((WARN++))
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
# user could be using vanilla iptables, check if kernel module is loaded
|
||||||
|
fw="iptables"
|
||||||
|
if lsmod | grep -q '^ip_tables' 2>/dev/null; then
|
||||||
|
FW_VER="\e[32m[PASS]\e[0m Firewall service (${fw}) is active\n"
|
||||||
|
((PASS++))
|
||||||
|
else
|
||||||
|
FW_VER="\e[93m[WARN]\e[0m No firewall is configured. Ensure ${fw} is installed and configured\n"
|
||||||
|
((WARN++))
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
}
|
||||||
|
function checkUpdates {
|
||||||
|
if [[ $OS == "Ubuntu" ]] || [[ "$OS" =~ Debian.* ]]; then
|
||||||
|
# Ensure /tmp exists and has the proper permissions before
|
||||||
|
# checking for security updates
|
||||||
|
# https://github.com/digitalocean/marketplace-partners/issues/94
|
||||||
|
if [[ ! -d /tmp ]]; then
|
||||||
|
mkdir /tmp
|
||||||
|
fi
|
||||||
|
chmod 1777 /tmp
|
||||||
|
|
||||||
|
echo -en "\nUpdating apt package database to check for security updates, this may take a minute...\n\n"
|
||||||
|
apt-get -y update > /dev/null
|
||||||
|
|
||||||
|
uc=$(apt-get --just-print upgrade | grep -i "security" -c)
|
||||||
|
if [[ $uc -gt 0 ]]; then
|
||||||
|
update_count=$(( uc / 2 ))
|
||||||
|
else
|
||||||
|
update_count=0
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ $update_count -gt 0 ]]; then
|
||||||
|
echo -en "\e[41m[FAIL]\e[0m There are ${update_count} security updates available for this image that have not been installed.\n"
|
||||||
|
echo -en
|
||||||
|
echo -en "Here is a list of the security updates that are not installed:\n"
|
||||||
|
sleep 2
|
||||||
|
apt-get --just-print upgrade | grep -i security | awk '{print $2}' | awk '!seen[$0]++'
|
||||||
|
echo -en
|
||||||
|
# shellcheck disable=SC2031
|
||||||
|
((FAIL++))
|
||||||
|
STATUS=2
|
||||||
|
else
|
||||||
|
echo -en "\e[32m[PASS]\e[0m There are no pending security updates for this image.\n\n"
|
||||||
|
((PASS++))
|
||||||
|
fi
|
||||||
|
elif [[ $OS == "CentOS Linux" ]] || [[ $OS == "CentOS Stream" ]] || [[ $OS == "Rocky Linux" ]]; then
|
||||||
|
echo -en "\nChecking for available security updates, this may take a minute...\n\n"
|
||||||
|
|
||||||
|
update_count=$(yum check-update --security --quiet | wc -l)
|
||||||
|
if [[ $update_count -gt 0 ]]; then
|
||||||
|
echo -en "\e[41m[FAIL]\e[0m There are ${update_count} security updates available for this image that have not been installed.\n"
|
||||||
|
((FAIL++))
|
||||||
|
STATUS=2
|
||||||
|
else
|
||||||
|
echo -en "\e[32m[PASS]\e[0m There are no pending security updates for this image.\n"
|
||||||
|
((PASS++))
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
echo "Error encountered"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
function checkCloudInit {
|
||||||
|
|
||||||
|
if hash cloud-init 2>/dev/null; then
|
||||||
|
CI="\e[32m[PASS]\e[0m Cloud-init is installed.\n"
|
||||||
|
((PASS++))
|
||||||
|
else
|
||||||
|
CI="\e[41m[FAIL]\e[0m No valid verison of cloud-init was found.\n"
|
||||||
|
((FAIL++))
|
||||||
|
STATUS=2
|
||||||
|
fi
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
|
||||||
|
function version_gt() { test "$(printf '%s\n' "$@" | sort -V | head -n 1)" != "$1"; }
|
||||||
|
|
||||||
|
|
||||||
|
clear
|
||||||
|
echo "DigitalOcean Marketplace Image Validation Tool ${VERSION}"
|
||||||
|
echo "Executed on: ${RUNDATE}"
|
||||||
|
echo "Checking local system for Marketplace compatibility..."
|
||||||
|
|
||||||
|
getDistro
|
||||||
|
|
||||||
|
echo -en "\n\e[1mDistribution:\e[0m ${OS}\n"
|
||||||
|
echo -en "\e[1mVersion:\e[0m ${VER}\n\n"
|
||||||
|
|
||||||
|
ost=0
|
||||||
|
osv=0
|
||||||
|
|
||||||
|
if [[ $OS == "Ubuntu" ]]; then
|
||||||
|
ost=1
|
||||||
|
if [[ $VER == "22.04" ]] || [[ $VER == "20.04" ]] || [[ $VER == "18.04" ]] || [[ $VER == "16.04" ]]; then
|
||||||
|
osv=1
|
||||||
|
fi
|
||||||
|
|
||||||
|
elif [[ "$OS" =~ Debian.* ]]; then
|
||||||
|
ost=1
|
||||||
|
case "$VER" in
|
||||||
|
9)
|
||||||
|
osv=1
|
||||||
|
;;
|
||||||
|
10)
|
||||||
|
osv=1
|
||||||
|
;;
|
||||||
|
11)
|
||||||
|
osv=1
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
osv=2
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
elif [[ $OS == "CentOS Linux" ]]; then
|
||||||
|
ost=1
|
||||||
|
if [[ $VER == "8" ]]; then
|
||||||
|
osv=1
|
||||||
|
elif [[ $VER == "7" ]]; then
|
||||||
|
osv=1
|
||||||
|
elif [[ $VER == "6" ]]; then
|
||||||
|
osv=1
|
||||||
|
else
|
||||||
|
osv=2
|
||||||
|
fi
|
||||||
|
elif [[ $OS == "CentOS Stream" ]]; then
|
||||||
|
ost=1
|
||||||
|
if [[ $VER == "8" ]]; then
|
||||||
|
osv=1
|
||||||
|
else
|
||||||
|
osv=2
|
||||||
|
fi
|
||||||
|
elif [[ $OS == "Rocky Linux" ]]; then
|
||||||
|
ost=1
|
||||||
|
if [[ $VER =~ 8\. ]]; then
|
||||||
|
osv=1
|
||||||
|
else
|
||||||
|
osv=2
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
ost=0
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ $ost == 1 ]]; then
|
||||||
|
echo -en "\e[32m[PASS]\e[0m Supported Operating System Detected: ${OS}\n"
|
||||||
|
((PASS++))
|
||||||
|
else
|
||||||
|
echo -en "\e[41m[FAIL]\e[0m ${OS} is not a supported Operating System\n"
|
||||||
|
((FAIL++))
|
||||||
|
STATUS=2
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ $osv == 1 ]]; then
|
||||||
|
echo -en "\e[32m[PASS]\e[0m Supported Release Detected: ${VER}\n"
|
||||||
|
((PASS++))
|
||||||
|
elif [[ $ost == 1 ]]; then
|
||||||
|
echo -en "\e[41m[FAIL]\e[0m ${OS} ${VER} is not a supported Operating System Version\n"
|
||||||
|
((FAIL++))
|
||||||
|
STATUS=2
|
||||||
|
else
|
||||||
|
echo "Exiting..."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
checkCloudInit
|
||||||
|
|
||||||
|
echo -en "${CI}"
|
||||||
|
|
||||||
|
checkFirewall
|
||||||
|
|
||||||
|
echo -en "${FW_VER}"
|
||||||
|
|
||||||
|
checkUpdates
|
||||||
|
|
||||||
|
loadPasswords
|
||||||
|
|
||||||
|
checkLogs
|
||||||
|
|
||||||
|
echo -en "\n\nChecking all user-created accounts...\n"
|
||||||
|
checkUsers
|
||||||
|
|
||||||
|
echo -en "\n\nChecking the root account...\n"
|
||||||
|
checkRoot
|
||||||
|
|
||||||
|
checkAgent
|
||||||
|
|
||||||
|
|
||||||
|
# Summary
|
||||||
|
echo -en "\n\n---------------------------------------------------------------------------------------------------\n"
|
||||||
|
|
||||||
|
if [[ $STATUS == 0 ]]; then
|
||||||
|
echo -en "Scan Complete.\n\e[32mAll Tests Passed!\e[0m\n"
|
||||||
|
elif [[ $STATUS == 1 ]]; then
|
||||||
|
echo -en "Scan Complete. \n\e[93mSome non-critical tests failed. Please review these items.\e[0m\e[0m\n"
|
||||||
|
else
|
||||||
|
echo -en "Scan Complete. \n\e[41mOne or more tests failed. Please review these items and re-test.\e[0m\n"
|
||||||
|
fi
|
||||||
|
echo "---------------------------------------------------------------------------------------------------"
|
||||||
|
echo -en "\e[1m${PASS} Tests PASSED\e[0m\n"
|
||||||
|
echo -en "\e[1m${WARN} WARNINGS\e[0m\n"
|
||||||
|
echo -en "\e[1m${FAIL} Tests FAILED\e[0m\n"
|
||||||
|
echo -en "---------------------------------------------------------------------------------------------------\n"
|
||||||
|
|
||||||
|
if [[ $STATUS == 0 ]]; then
|
||||||
|
echo -en "We did not detect any issues with this image. Please be sure to manually ensure that all software installed on the base system is functional, secure and properly configured (or facilities for configuration on first-boot have been created).\n\n"
|
||||||
|
exit 0
|
||||||
|
elif [[ $STATUS == 1 ]]; then
|
||||||
|
echo -en "Please review all [WARN] items above and ensure they are intended or resolved. If you do not have a specific requirement, we recommend resolving these items before image submission\n\n"
|
||||||
|
exit 0
|
||||||
|
else
|
||||||
|
echo -en "Some critical tests failed. These items must be resolved and this scan re-run before you submit your image to the DigitalOcean Marketplace.\n\n"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
@ -0,0 +1,14 @@
|
|||||||
|
diff --git a/node_modules/extract-files/package.json b/node_modules/extract-files/package.json
|
||||||
|
index 636fa03..1b75f79 100644
|
||||||
|
--- a/node_modules/extract-files/package.json
|
||||||
|
+++ b/node_modules/extract-files/package.json
|
||||||
|
@@ -34,6 +34,9 @@
|
||||||
|
"import": "./public/index.mjs",
|
||||||
|
"require": "./public/index.js"
|
||||||
|
},
|
||||||
|
+ "./public/extractFiles": "./public/extractFiles.js",
|
||||||
|
+ "./public/isExtractableFile": "./public/isExtractableFile.js",
|
||||||
|
+ "./public/ReactNativeFile": "./public/ReactNativeFile.js",
|
||||||
|
"./public/": "./public/",
|
||||||
|
"./package": "./package.json",
|
||||||
|
"./package.json": "./package.json"
|
||||||
@ -0,0 +1,2 @@
|
|||||||
|
head: |
|
||||||
|
<script async defer data-website-id="{{websiteID}}" src="{{url}}/umami.js"></script>
|
||||||
@ -0,0 +1,17 @@
|
|||||||
|
key: umami
|
||||||
|
title: Umami Analytics v1
|
||||||
|
description: Umami is a simple, fast, privacy-focused alternative to Google Analytics.
|
||||||
|
author: CDN18
|
||||||
|
logo: https://static.requarks.io/logo/umami.svg
|
||||||
|
website: https://umami.is
|
||||||
|
isAvailable: true
|
||||||
|
props:
|
||||||
|
websiteID:
|
||||||
|
type: String
|
||||||
|
title: Website ID
|
||||||
|
order: 1
|
||||||
|
url:
|
||||||
|
type: String
|
||||||
|
title: Umami Server URL
|
||||||
|
hint: The URL of your Umami instance. It should start with http/https and omit the trailing slash. (e.g. https://umami.example.com)
|
||||||
|
order: 2
|
||||||
@ -0,0 +1,2 @@
|
|||||||
|
head: |
|
||||||
|
<script async src="{{url}}/script.js" data-website-id="{{websiteID}}"></script>
|
||||||
@ -0,0 +1,17 @@
|
|||||||
|
key: umami2
|
||||||
|
title: Umami Analytics v2
|
||||||
|
description: Umami is a simple, fast, privacy-focused alternative to Google Analytics.
|
||||||
|
author: CDN18
|
||||||
|
logo: https://static.requarks.io/logo/umami.svg
|
||||||
|
website: https://umami.is
|
||||||
|
isAvailable: true
|
||||||
|
props:
|
||||||
|
websiteID:
|
||||||
|
type: String
|
||||||
|
title: Website ID
|
||||||
|
order: 1
|
||||||
|
url:
|
||||||
|
type: String
|
||||||
|
title: Umami Server URL
|
||||||
|
hint: The URL of your Umami instance. It should start with http/https and omit the trailing slash. (e.g. https://umami.example.com)
|
||||||
|
order: 2
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue