rnsrk/wisski-cloud-distillery
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Expose 'install-dompurify' and 'install-colorbox'

Browse source 
This commit exposes the install dompurify and install colorbox
javascript libraries via the browser.
This commit is contained in:
Tom Wiesing 2023-12-04 12:21:17 +01:00
parent b2231f6307
commit 0ab8d3a4e4
No known key found for this signature in database
9 changed files with 179 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

9
internal/dis/component/instances/runtime/install_colorbox.sh
View file

@ -1,6 +1,15 @@
#!/bin/bash
set -e
echo "=> Setting up filesystem permissions"
chmod 777 /var/www/data/project/web/sites/default/
trap "chmod 755 /var/www/data/project/web/sites/default/" EXIT
echo "=> Creating 'sites/default/libraries/colorbox/' directory"
mkdir -p /var/www/data/project/web/sites/default/libraries/colorbox
echo "=> Downloading 'jquery.colorbox-min.js' and 'LICENSE.md'"
curl -L https://raw.githubusercontent.com/jackmoore/colorbox/master/LICENSE.md -o /var/www/data/project/web/sites/default/libraries/colorbox/LICENSE.md
curl -L https://raw.githubusercontent.com/jackmoore/colorbox/master/jquery.colorbox-min.js -o /var/www/data/project/web/sites/default/libraries/colorbox/jquery.colorbox-min.js
echo "=> Done"

10
internal/dis/component/instances/runtime/install_dompurify.sh
View file

@ -1,5 +1,11 @@
#!/bin/bash
set -e
mkdir -p /var/www/data/project/web/libraries/DOMPurify/dist/
curl -L https://raw.githubusercontent.com/cure53/DOMPurify/main/dist/purify.min.js -o /var/www/data/project/web/libraries/DOMPurify/dist/purify.min.js
echo "=> Creating 'sites/default/libraries/dompurity/dist/' directory"
mkdir -p /var/www/data/project/web/libraries/dompurity/dist/
echo "=> Downloading 'purify.min.js' and 'LICENSE'"
curl -L https://raw.githubusercontent.com/cure53/DOMPurify/main/dist/purify.min.js -o /var/www/data/project/web/libraries/DOMPurify/dist/purify.min.js
curl -L https://raw.githubusercontent.com/cure53/DOMPurify/main/LICENSE -o /var/www/data/project/web/libraries/DOMPurify/LICENSE
echo "=> Done"

11
internal/dis/component/server/admin/html/instance_drupal.html
View file

@ -45,6 +45,17 @@
</div>
</div>
<div class="pure-u-1">
<h2 id="info">Drupal Utilities</h2>
</div>
<div class="pure-u-1">
<button class="remote-action pure-button pure-button-action" data-action="install-colorbox-js" data-param="{{ .Instance.Slug }}" data-buffer="1000" data-force-reload>Install Colorbox JavaScript</button>
<button class="remote-action pure-button pure-button-action" data-action="install-dompurify-js" data-param="{{ .Instance.Slug }}" data-buffer="1000" data-force-reload>Install DOMPurify JavaScript</button>
</div>
<div class="pure-u-1">
<h2 id="requirements">Status Report</h2>
<p>

2
internal/dis/component/server/admin/instance.go
View file

@ -79,7 +79,7 @@ func (admin *Admin) instanceTabs(slug string, active string) templating.FlagFunc
{Title: "Overview", Path: template.URL("/admin/instance/" + slug), Active: active == "overview"},
{Title: "Rebuild", Path: template.URL("/admin/instance/" + slug + "/rebuild"), Active: active == "rebuild"},
{Title: "Users & Grants", Path: template.URL("/admin/instance/" + slug + "/users"), Active: active == "users"},
{Title: "Drupal Status", Path: template.URL("/admin/instance/" + slug + "/drupal"), Active: active == "drupal"},
{Title: "Drupal", Path: template.URL("/admin/instance/" + slug + "/drupal"), Active: active == "drupal"},
{Title: "WissKI Data", Path: template.URL("/admin/instance/" + slug + "/data"), Active: active == "data"},
{Title: "WissKI Stats", Path: template.URL("/admin/instance/" + slug + "/stats"), Active: active == "stats"},
{Title: "SSH", Path: template.URL("/admin/instance/" + slug + "/ssh"), Active: active == "ssh"},

4
internal/dis/component/server/admin/instance_drupal.go
View file

@ -91,8 +91,8 @@ func (admin *Admin) instanceDrupal(ctx context.Context) http.Handler {
return ctx, []templating.FlagFunc{
templating.ReplaceCrumb(menuInstance, component.MenuItem{Title: "Instance", Path: template.URL("/admin/instance/" + ctx.Instance.Slug)}),
templating.ReplaceCrumb(menuDrupal, component.MenuItem{Title: "Drupal Status", Path: template.URL("/admin/instance/" + ctx.Instance.Slug + "/drupal")}),
templating.Title(ctx.Instance.Slug + " - Drupal Status"),
templating.ReplaceCrumb(menuDrupal, component.MenuItem{Title: "Drupal", Path: template.URL("/admin/instance/" + ctx.Instance.Slug + "/drupal")}),
templating.Title(ctx.Instance.Slug + " - Drupal"),
admin.instanceTabs(slug, "drupal"),
}, nil
})

57
internal/dis/component/server/admin/socket/actions/libraries.go Normal file
View file

@ -0,0 +1,57 @@
package actions
import (
"context"
"io"
"github.com/FAU-CDI/wisski-distillery/internal/dis/component"
"github.com/FAU-CDI/wisski-distillery/internal/dis/component/auth/scopes"
"github.com/FAU-CDI/wisski-distillery/internal/wisski"
"github.com/tkw1536/pkglib/stream"
)
// installing additional javascript libraries
type InstallColorboxJS struct {
component.Base
}
var (
_ WebsocketInstanceAction = (*InstallColorboxJS)(nil)
)
func (*InstallColorboxJS) Action() InstanceAction {
return InstanceAction{
Action: Action{
Name: "install-colorbox-js",
Scope: scopes.ScopeUserAdmin,
NumParams: 0,
},
}
}
func (*InstallColorboxJS) Act(ctx context.Context, instance *wisski.WissKI, in io.Reader, out io.Writer, params ...string) error {
return instance.Barrel().Shell(ctx, stream.NewIOStream(out, out, nil), "/runtime/install_colorbox.sh")
}
type InstallDompurifyJS struct {
component.Base
}
var (
_ WebsocketInstanceAction = (*InstallDompurifyJS)(nil)
)
func (*InstallDompurifyJS) Action() InstanceAction {
return InstanceAction{
Action: Action{
Name: "install-dompurify-js",
Scope: scopes.ScopeUserAdmin,
NumParams: 0,
},
}
}
func (*InstallDompurifyJS) Act(ctx context.Context, instance *wisski.WissKI, in io.Reader, out io.Writer, params ...string) error {
return instance.Barrel().Shell(ctx, stream.NewIOStream(out, out, nil), "/runtime/install_dompurify.sh")
}

4
internal/dis/component/server/assets/assets_disclaimer.txt
View file

File diff suppressed because one or more lines are too long

2
internal/dis/distillery.go
View file

@ -227,6 +227,8 @@ func (dis *Distillery) allComponents(context *lifetime.Registry[component.Compon
lifetime.Place[*actions.Rebuild](context)
lifetime.Place[*actions.Update](context)
lifetime.Place[*actions.Cron](context)
lifetime.Place[*actions.InstallColorboxJS](context)
lifetime.Place[*actions.InstallDompurifyJS](context)
lifetime.Place[*actions.Start](context)
lifetime.Place[*actions.Stop](context)
lifetime.Place[*actions.Purge](context)