medlogic
/
olivetin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: Repair output streaming, lots of css/go lint

This commit is contained in:
jamesread 2025-09-06 08:42:13 +01:00
parent 60c0c5db27
commit 570c0ba087
45 changed files with 673 additions and 521 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -4,7 +4,6 @@ service/OliveTin
service/OliveTin.armhf
service/OliveTin.exe
service/reports
service/gen
releases/
dist/
installation-id.txt

2
README.md
View File

@ -4,7 +4,7 @@
OliveTin gives **safe** and **simple** access to predefined shell commands from a web interface.
[![Maturity Badge](https://img.shields.io/badge/maturity-Production-brightgreen)](#none)
[![Maturity Badge](https://img.shields.io/badge/maturity-Production-brightgreen)](#none)
[![Discord](https://img.shields.io/discord/846737624960860180?label=Discord%20Server)](https://discord.gg/jhYWWpNJ3v)
[![Awesome](https://cdn.rawgit.com/sindresorhus/awesome/d7305f38d29fed78fa85652e3a63e154dd8e8829/media/badge.svg)](https://github.com/awesome-selfhosted/awesome-selfhosted#automation)
[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/5050/badge)](https://bestpractices.coreinfrastructure.org/projects/5050)

4
frontend/js/ArgumentForm.js
View File

@ -44,7 +44,7 @@ class ArgumentForm extends window.HTMLElement {
}
}
if (arg.name === "") {
if (arg.name === '') {
continue
}
@ -184,7 +184,7 @@ class ArgumentForm extends window.HTMLElement {
}
domEl.onchange = () => {
formatValidation(domEl, arg)
this.formatValidation(domEl, arg)
}
}
}

22
frontend/js/Mutex.js
View File

@ -1,24 +1,24 @@
export class Mutex {
constructor() {
this._locked = false;
this._waiting = [];
constructor () {
this._locked = false
this._waiting = []
}
lock() {
lock () {
const unlock = () => {
const next = this._waiting.shift();
const next = this._waiting.shift()
if (next) {
next(unlock);
next(unlock)
} else {
this._locked = false;
this._locked = false
}
}
};
if (this._locked) {
return new Promise(resolve => this._waiting.push(resolve)).then(() => unlock);
return new Promise(resolve => this._waiting.push(resolve)).then(() => unlock)
} else {
this._locked = true;
return Promise.resolve(unlock);
this._locked = true
return Promise.resolve(unlock)
}
}
}

62
frontend/js/marshaller.js
View File

@ -1,71 +1,11 @@
/**
* This is a weird function that just sets some globals.
*/
export function initMarshaller () {
window.logEntries = new Map()
window.addEventListener('EventExecutionStarted', onExecutionStarted)
window.addEventListener('EventExecutionFinished', onExecutionFinished)
window.addEventListener('EventOutputChunk', onOutputChunk)
}
function onOutputChunk (evt) {
const chunk = evt.payload
return;
if (chunk.executionTrackingId === window.executionDialog.executionTrackingId) {
if (chunk.executionTrackingId === window.terminal.executionTrackingId) {
window.terminal.write(chunk.output)
}
}
function onExecutionStarted (evt) {
const logEntry = evt.payload.logEntry
// marshalLogsJsonToHtml({
// logs: [logEntry]
// })
}
function onExecutionFinished (evt) {
const logEntry = evt.payload.logEntry
window.logEntries.set(logEntry.executionTrackingId, logEntry)
return;
const executionButton = document.querySelector('execution-button#execution-' + logEntry.executionTrackingId)
let feedbackButton = actionButton
switch (actionButton.popupOnStart) {
case 'execution-button':
if (executionButton != null) {
feedbackButton = executionButton
}
break
case 'execution-dialog-output-html':
case 'execution-dialog-stdout-only':
case 'execution-dialog':
// We don't need to fetch the logEntry for the dialog because we already
// have it, so we open the dialog and it will get updated below.
window.executionDialog.show()
window.executionDialog.executionTrackingId = logEntry.uuid
break
}
feedbackButton.onExecutionFinished(logEntry)
// marshalLogsJsonToHtml({
// logs: [logEntry]
// })
// If the current execution dialog is open, update that too
if (window.executionDialog.dlg.open && window.executionDialog.executionUuid === logEntry.uuid) {
window.executionDialog.renderExecutionResult({
logEntry: logEntry,
type: actionButton.popupOnStart
})
}
}

4
frontend/js/websocket.js
View File

@ -13,7 +13,7 @@ async function reconnectWebsocket () {
try {
window.websocketAvailable = true
for await (let e of window.client.eventStream()) {
for await (const e of window.client.eventStream()) {
handleEvent(e)
}
} catch (err) {
@ -38,8 +38,8 @@ function handleEvent (msg) {
break
case 'EventExecutionFinished':
case 'EventExecutionStarted':
console.log('EventExecutionStarted', msg.event.value.logEntry.executionTrackingId)
buttonResults[msg.event.value.logEntry.executionTrackingId] = msg.event.value.logEntry
window.dispatchEvent(j)
break
default:
console.warn('Unhandled websocket message type from server: ', typeName)

14
frontend/main.js
View File

@ -1,23 +1,25 @@
'use strict'
import 'femtocrank/style.css'
import { createClient } from '@connectrpc/connect'
import { createConnectTransport } from '@connectrpc/connect-web'
import { OliveTinApiService } from './resources/scripts/gen/olivetin/api/v1/olivetin_pb'
import { createApp } from 'vue'
import router from './resources/vue/router.js';
import App from './resources/vue/App.vue';
import router from './resources/vue/router.js'
import App from './resources/vue/App.vue'
import {
initMarshaller,
initMarshaller
} from './js/marshaller.js'
import { checkWebsocketConnection } from './js/websocket.js'
function initClient () {
const transport = createConnectTransport({
baseUrl: window.location.protocol + '//' + window.location.host + '/api/',
baseUrl: window.location.protocol + '//' + window.location.host + '/api/'
})
@ -27,7 +29,7 @@ function initClient () {
function setupVue () {
const app = createApp(App)
app.use(router);
app.use(router)
app.mount('#app')
}
@ -36,7 +38,7 @@ function main () {
checkWebsocketConnection()
setupVue();
setupVue()
initMarshaller()

2
frontend/package-lock.json generated
View File

@ -16,7 +16,7 @@
"@vitejs/plugin-vue": "^6.0.1",
"@xterm/addon-fit": "^0.10.0",
"@xterm/xterm": "^5.5.0",
"femtocrank": "^1.2.2",
"femtocrank": "^1.2.4",
"unplugin-vue-components": "^28.8.0",
"vite": "^7.0.6",
"vue-router": "^4.5.1"

26
frontend/resources/scripts/gen/olivetin/api/v1/olivetin_pb.d.ts vendored
View File

@ -1,4 +1,4 @@
// @generated by protoc-gen-es v2.6.3
// @generated by protoc-gen-es v2.7.0
// @generated from file olivetin/api/v1/olivetin.proto (package olivetin.api.v1, syntax proto3)
/* eslint-disable */
@ -1468,6 +1468,22 @@ export declare type GetEntityRequest = Message<"olivetin.api.v1.GetEntityRequest
*/
export declare const GetEntityRequestSchema: GenMessage<GetEntityRequest>;
/**
* @generated from message olivetin.api.v1.RestartActionRequest
*/
export declare type RestartActionRequest = Message<"olivetin.api.v1.RestartActionRequest"> & {
/**
* @generated from field: string execution_tracking_id = 1;
*/
executionTrackingId: string;
};
/**
* Describes the message olivetin.api.v1.RestartActionRequest.
* Use `create(RestartActionRequestSchema)` to create a new message.
*/
export declare const RestartActionRequestSchema: GenMessage<RestartActionRequest>;
/**
* @generated from service olivetin.api.v1.OliveTinApiService
*/
@ -1512,6 +1528,14 @@ export declare const OliveTinApiService: GenService<{
input: typeof StartActionByGetAndWaitRequestSchema;
output: typeof StartActionByGetAndWaitResponseSchema;
},
/**
* @generated from rpc olivetin.api.v1.OliveTinApiService.RestartAction
*/
restartAction: {
methodKind: "unary";
input: typeof RestartActionRequestSchema;
output: typeof StartActionResponseSchema;
},
/**
* @generated from rpc olivetin.api.v1.OliveTinApiService.KillAction
*/

11
frontend/resources/scripts/gen/olivetin/api/v1/olivetin_pb.js
View File

File diff suppressed because one or more lines are too long

2
frontend/resources/vue/ActionButton.vue
View File

@ -73,7 +73,7 @@ function constructFromJson(json) {
updateFromJson(json)
actionId.value = json.id
actionId.value = json.bindingId
title.value = json.title
canExec.value = json.canExec
popupOnStart.value = json.popupOnStart

5
frontend/resources/vue/App.vue
View File

@ -30,7 +30,7 @@
<div id="layout">
<Sidebar ref="sidebar" />
<div id="content">
<div id="content" initial-martial-complete="{{ hasLoaded }}">
<main title="Main content">
<router-view :key="$route.fullPath" />
</main>
@ -78,6 +78,7 @@ const serverConnection = ref('Connected');
const currentVersion = ref('?');
const bannerMessage = ref('');
const bannerCss = ref('');
const hasLoaded = ref(false);
function toggleSidebar() {
sidebar.value.toggle()
@ -102,6 +103,8 @@ async function requestInit() {
icon: '📊'
})
}
hasLoaded.value = true;
} catch (error) {
console.error("Error initializing client", error)
}

40
frontend/resources/vue/views/ExecutionView.vue
View File

@ -54,12 +54,13 @@
</template>
<script setup>
import { ref, reactive, onMounted, onBeforeUnmount, nextTick } from 'vue'
import { ref, reactive, onMounted, onBeforeUnmount, nextTick, watch } from 'vue'
import ActionStatusDisplay from '../components/ActionStatusDisplay.vue'
import { OutputTerminal } from '../../../js/OutputTerminal.js'
import { HugeiconsIcon } from '@hugeicons/vue'
import { WorkoutRunIcon, Cancel02Icon, ArrowLeftIcon } from '@hugeicons/core-free-icons'
import { useRouter } from 'vue-router'
import { buttonResults } from '../stores/buttonResults'
const router = useRouter()
@ -75,7 +76,6 @@ const props = defineProps({
})
const executionTrackingId = ref(props.executionTrackingId)
const isBig = ref(false)
const hideBasics = ref(false)
const hideDetails = ref(false)
const hideDetailsOnResult = ref(false)
@ -92,28 +92,20 @@ let executionTicker = null
let terminal = null
function initializeTerminal() {
terminal = new OutputTerminal()
console.log('initializeTerminal', xtermOutput.value)
terminal = new OutputTerminal(executionTrackingId.value, this)
terminal.open(xtermOutput.value)
terminal.resize(80, 24)
window.terminal = terminal
}
function toggleSize() {
isBig.value = !isBig.value
if (isBig.value) {
terminal.fit()
} else {
terminal.resize(80, 24)
}
}
async function reset() {
executionSeconds.value = 0
executionTrackingId.value = 'notset'
isBig.value = false
hideBasics.value = false
hideDetails.value = false
hideDetailsOnResult.value = false
@ -152,13 +144,11 @@ function show(actionButton) {
}, 1000)
}
function rerunAction() {
if (logEntry.value && logEntry.value.actionId) {
const actionButton = document.getElementById('actionButton-' + logEntry.value.actionId)
if (actionButton && actionButton.btn) {
actionButton.btn.click()
}
}
async function rerunAction() {
let startActionArgs = {}
const res = await window.client.startAction(startActionArgs)
router.push(`/logs/${res.executionTrackingId}`)
}
async function killAction() {
@ -293,6 +283,18 @@ function goBack() {
onMounted(() => {
initializeTerminal()
fetchExecutionResult(props.executionTrackingId)
watch(
() => buttonResults[props.executionTrackingId],
(newResult, oldResult) => {
if (newResult) {
renderExecutionResult({
logEntry: newResult
})
}
}
)
})
onBeforeUnmount(() => {

8
frontend/style.css
View File

@ -1,5 +1,3 @@
@import 'femtocrank/style.css';
header {
position: fixed;
width: 100%;
@ -8,6 +6,7 @@ header {
aside {
padding-top: 4em;
z-index: 3; /* Make sure the sidebar is on top of the terminal */
}
fieldset {
@ -45,6 +44,7 @@ action-button > button .icon {
dialog {
border-radius: 1em;
}
footer span {
margin-right: 1em;
}
@ -104,10 +104,6 @@ th {
background-color: #fff;
}
aside {
z-index: 3; /* Make sure the sidebar is on top of the terminal */
}
section.small {
border-radius: .4em;
}

102
proto/olivetin/api/v1/olivetin.proto
View File

@ -5,7 +5,7 @@ package olivetin.api.v1;
option go_package = "github.com/OliveTin/OliveTin/gen/olivetin/api/v1;apiv1";
message Action {
string id = 1;
string binding_id = 1;
string title = 2;
string icon = 3;
bool can_exec = 4;
@ -33,19 +33,14 @@ message ActionArgumentChoice {
message Entity {
string title = 1;
string icon = 2;
repeated Action actions = 3;
string unique_key = 2;
string type = 3;
}
message GetDashboardComponentsResponse {
message GetDashboardResponse {
string title = 1;
repeated Dashboard dashboards = 4;
string authenticated_user = 5;
string authenticated_user_provider = 6;
EffectivePolicy effective_policy = 7;
Dashboard dashboard = 4;
}
message EffectivePolicy {
@ -53,7 +48,9 @@ message EffectivePolicy {
bool show_log_list = 2;
}
message GetDashboardComponentsRequest {}
message GetDashboardRequest {
string title = 1;
}
message Dashboard {
string title = 1;
@ -66,10 +63,11 @@ message DashboardComponent {
repeated DashboardComponent contents = 3;
string icon = 4;
string css_class = 5;
Action action = 6;
}
message StartActionRequest {
string action_id = 1;
string binding_id = 1;
repeated StartActionArgument arguments = 2;
@ -139,6 +137,8 @@ message GetLogsResponse {
repeated LogEntry logs = 1;
int64 count_remaining = 2;
int64 page_size = 3;
int64 total_count = 4;
int64 start_offset = 5;
}
message ValidateArgumentTypeRequest {
@ -280,8 +280,74 @@ message GetDiagnosticsResponse {
string SshFoundConfig = 2;
}
message InitRequest {}
message InitResponse {
bool showFooter = 1;
bool showNavigation = 2;
bool showNewVersions = 3;
string availableVersion = 4;
string currentVersion = 5;
string pageTitle = 6;
string sectionNavigationStyle = 7;
string defaultIconForBack = 8;
bool enableCustomJs = 9;
string authLoginUrl = 10;
bool authLocalLogin = 11;
repeated string styleMods = 12;
repeated OAuth2Provider oAuth2Providers = 13;
repeated AdditionalLink additionalLinks = 14;
repeated string rootDashboards = 15;
string authenticated_user = 16;
string authenticated_user_provider = 17;
EffectivePolicy effective_policy = 18;
string banner_message = 19;
string banner_css = 20;
}
message AdditionalLink {
string title = 1;
string url = 2;
}
message OAuth2Provider {
string title = 1;
string url = 2;
string icon = 3;
}
message GetActionBindingRequest {
string binding_id = 1;
}
message GetActionBindingResponse {
Action action = 1;
}
message GetEntitiesRequest {
}
message GetEntitiesResponse {
repeated EntityDefinition entity_definitions = 1;
}
message EntityDefinition {
string title = 1;
repeated Entity instances = 2;
repeated string used_on_dashboards = 3;
}
message GetEntityRequest {
string unique_key = 1;
string type = 2;
}
message RestartActionRequest {
string execution_tracking_id = 1;
}
service OliveTinApiService {
rpc GetDashboardComponents(GetDashboardComponentsRequest) returns (GetDashboardComponentsResponse) {}
rpc GetDashboard(GetDashboardRequest) returns (GetDashboardResponse) {}
rpc StartAction(StartActionRequest) returns (StartActionResponse) {}
@ -291,6 +357,8 @@ service OliveTinApiService {
rpc StartActionByGetAndWait(StartActionByGetAndWaitRequest) returns (StartActionByGetAndWaitResponse) {}
rpc RestartAction(RestartActionRequest) returns (StartActionResponse) {}
rpc KillAction(KillActionRequest) returns (KillActionResponse) {}
rpc ExecutionStatus(ExecutionStatusRequest) returns (ExecutionStatusResponse) {}
@ -318,4 +386,12 @@ service OliveTinApiService {
rpc EventStream(EventStreamRequest) returns (stream EventStreamResponse) {}
rpc GetDiagnostics(GetDiagnosticsRequest) returns (GetDiagnosticsResponse) {}
rpc Init(InitRequest) returns (InitResponse) {}
rpc GetActionBinding(GetActionBindingRequest) returns (GetActionBindingResponse) {}
rpc GetEntities(GetEntitiesRequest) returns (GetEntitiesResponse) {}
rpc GetEntity(GetEntityRequest) returns (Entity) {}
}

29
service/gen/olivetin/api/v1/apiv1connect/olivetin.connect.go
View File

@ -48,6 +48,9 @@ const (
// OliveTinApiServiceStartActionByGetAndWaitProcedure is the fully-qualified name of the
// OliveTinApiService's StartActionByGetAndWait RPC.
OliveTinApiServiceStartActionByGetAndWaitProcedure = "/olivetin.api.v1.OliveTinApiService/StartActionByGetAndWait"
// OliveTinApiServiceRestartActionProcedure is the fully-qualified name of the OliveTinApiService's
// RestartAction RPC.
OliveTinApiServiceRestartActionProcedure = "/olivetin.api.v1.OliveTinApiService/RestartAction"
// OliveTinApiServiceKillActionProcedure is the fully-qualified name of the OliveTinApiService's
// KillAction RPC.
OliveTinApiServiceKillActionProcedure = "/olivetin.api.v1.OliveTinApiService/KillAction"
@ -110,6 +113,7 @@ type OliveTinApiServiceClient interface {
StartActionAndWait(context.Context, *connect.Request[v1.StartActionAndWaitRequest]) (*connect.Response[v1.StartActionAndWaitResponse], error)
StartActionByGet(context.Context, *connect.Request[v1.StartActionByGetRequest]) (*connect.Response[v1.StartActionByGetResponse], error)
StartActionByGetAndWait(context.Context, *connect.Request[v1.StartActionByGetAndWaitRequest]) (*connect.Response[v1.StartActionByGetAndWaitResponse], error)
RestartAction(context.Context, *connect.Request[v1.RestartActionRequest]) (*connect.Response[v1.StartActionResponse], error)
KillAction(context.Context, *connect.Request[v1.KillActionRequest]) (*connect.Response[v1.KillActionResponse], error)
ExecutionStatus(context.Context, *connect.Request[v1.ExecutionStatusRequest]) (*connect.Response[v1.ExecutionStatusResponse], error)
GetLogs(context.Context, *connect.Request[v1.GetLogsRequest]) (*connect.Response[v1.GetLogsResponse], error)
@ -171,6 +175,12 @@ func NewOliveTinApiServiceClient(httpClient connect.HTTPClient, baseURL string,
connect.WithSchema(oliveTinApiServiceMethods.ByName("StartActionByGetAndWait")),
connect.WithClientOptions(opts...),
),
restartAction: connect.NewClient[v1.RestartActionRequest, v1.StartActionResponse](
httpClient,
baseURL+OliveTinApiServiceRestartActionProcedure,
connect.WithSchema(oliveTinApiServiceMethods.ByName("RestartAction")),
connect.WithClientOptions(opts...),
),
killAction: connect.NewClient[v1.KillActionRequest, v1.KillActionResponse](
httpClient,
baseURL+OliveTinApiServiceKillActionProcedure,
@ -289,6 +299,7 @@ type oliveTinApiServiceClient struct {
startActionAndWait *connect.Client[v1.StartActionAndWaitRequest, v1.StartActionAndWaitResponse]
startActionByGet *connect.Client[v1.StartActionByGetRequest, v1.StartActionByGetResponse]
startActionByGetAndWait *connect.Client[v1.StartActionByGetAndWaitRequest, v1.StartActionByGetAndWaitResponse]
restartAction *connect.Client[v1.RestartActionRequest, v1.StartActionResponse]
killAction *connect.Client[v1.KillActionRequest, v1.KillActionResponse]
executionStatus *connect.Client[v1.ExecutionStatusRequest, v1.ExecutionStatusResponse]
getLogs *connect.Client[v1.GetLogsRequest, v1.GetLogsResponse]
@ -334,6 +345,11 @@ func (c *oliveTinApiServiceClient) StartActionByGetAndWait(ctx context.Context,
return c.startActionByGetAndWait.CallUnary(ctx, req)
}
// RestartAction calls olivetin.api.v1.OliveTinApiService.RestartAction.
func (c *oliveTinApiServiceClient) RestartAction(ctx context.Context, req *connect.Request[v1.RestartActionRequest]) (*connect.Response[v1.StartActionResponse], error) {
return c.restartAction.CallUnary(ctx, req)
}
// KillAction calls olivetin.api.v1.OliveTinApiService.KillAction.
func (c *oliveTinApiServiceClient) KillAction(ctx context.Context, req *connect.Request[v1.KillActionRequest]) (*connect.Response[v1.KillActionResponse], error) {
return c.killAction.CallUnary(ctx, req)
@ -431,6 +447,7 @@ type OliveTinApiServiceHandler interface {
StartActionAndWait(context.Context, *connect.Request[v1.StartActionAndWaitRequest]) (*connect.Response[v1.StartActionAndWaitResponse], error)
StartActionByGet(context.Context, *connect.Request[v1.StartActionByGetRequest]) (*connect.Response[v1.StartActionByGetResponse], error)
StartActionByGetAndWait(context.Context, *connect.Request[v1.StartActionByGetAndWaitRequest]) (*connect.Response[v1.StartActionByGetAndWaitResponse], error)
RestartAction(context.Context, *connect.Request[v1.RestartActionRequest]) (*connect.Response[v1.StartActionResponse], error)
KillAction(context.Context, *connect.Request[v1.KillActionRequest]) (*connect.Response[v1.KillActionResponse], error)
ExecutionStatus(context.Context, *connect.Request[v1.ExecutionStatusRequest]) (*connect.Response[v1.ExecutionStatusResponse], error)
GetLogs(context.Context, *connect.Request[v1.GetLogsRequest]) (*connect.Response[v1.GetLogsResponse], error)
@ -488,6 +505,12 @@ func NewOliveTinApiServiceHandler(svc OliveTinApiServiceHandler, opts ...connect
connect.WithSchema(oliveTinApiServiceMethods.ByName("StartActionByGetAndWait")),
connect.WithHandlerOptions(opts...),
)
oliveTinApiServiceRestartActionHandler := connect.NewUnaryHandler(
OliveTinApiServiceRestartActionProcedure,
svc.RestartAction,
connect.WithSchema(oliveTinApiServiceMethods.ByName("RestartAction")),
connect.WithHandlerOptions(opts...),
)
oliveTinApiServiceKillActionHandler := connect.NewUnaryHandler(
OliveTinApiServiceKillActionProcedure,
svc.KillAction,
@ -608,6 +631,8 @@ func NewOliveTinApiServiceHandler(svc OliveTinApiServiceHandler, opts ...connect
oliveTinApiServiceStartActionByGetHandler.ServeHTTP(w, r)
case OliveTinApiServiceStartActionByGetAndWaitProcedure:
oliveTinApiServiceStartActionByGetAndWaitHandler.ServeHTTP(w, r)
case OliveTinApiServiceRestartActionProcedure:
oliveTinApiServiceRestartActionHandler.ServeHTTP(w, r)
case OliveTinApiServiceKillActionProcedure:
oliveTinApiServiceKillActionHandler.ServeHTTP(w, r)
case OliveTinApiServiceExecutionStatusProcedure:
@ -673,6 +698,10 @@ func (UnimplementedOliveTinApiServiceHandler) StartActionByGetAndWait(context.Co
return nil, connect.NewError(connect.CodeUnimplemented, errors.New("olivetin.api.v1.OliveTinApiService.StartActionByGetAndWait is not implemented"))
}
func (UnimplementedOliveTinApiServiceHandler) RestartAction(context.Context, *connect.Request[v1.RestartActionRequest]) (*connect.Response[v1.StartActionResponse], error) {
return nil, connect.NewError(connect.CodeUnimplemented, errors.New("olivetin.api.v1.OliveTinApiService.RestartAction is not implemented"))
}
func (UnimplementedOliveTinApiServiceHandler) KillAction(context.Context, *connect.Request[v1.KillActionRequest]) (*connect.Response[v1.KillActionResponse], error) {
return nil, connect.NewError(connect.CodeUnimplemented, errors.New("olivetin.api.v1.OliveTinApiService.KillAction is not implemented"))
}

158
service/gen/olivetin/api/v1/olivetin.pb.go
View File

@ -1,6 +1,6 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.36.7
// protoc-gen-go v1.36.8
// protoc (unknown)
// source: olivetin/api/v1/olivetin.proto
@ -3567,6 +3567,50 @@ func (x *GetEntityRequest) GetType() string {
return ""
}
type RestartActionRequest struct {
state protoimpl.MessageState `protogen:"open.v1"`
ExecutionTrackingId string `protobuf:"bytes,1,opt,name=execution_tracking_id,json=executionTrackingId,proto3" json:"execution_tracking_id,omitempty"`
unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache
}
func (x *RestartActionRequest) Reset() {
*x = RestartActionRequest{}
mi := &file_olivetin_api_v1_olivetin_proto_msgTypes[65]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
func (x *RestartActionRequest) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*RestartActionRequest) ProtoMessage() {}
func (x *RestartActionRequest) ProtoReflect() protoreflect.Message {
mi := &file_olivetin_api_v1_olivetin_proto_msgTypes[65]
if x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
}
// Deprecated: Use RestartActionRequest.ProtoReflect.Descriptor instead.
func (*RestartActionRequest) Descriptor() ([]byte, []int) {
return file_olivetin_api_v1_olivetin_proto_rawDescGZIP(), []int{65}
}
func (x *RestartActionRequest) GetExecutionTrackingId() string {
if x != nil {
return x.ExecutionTrackingId
}
return ""
}
var File_olivetin_api_v1_olivetin_proto protoreflect.FileDescriptor
const file_olivetin_api_v1_olivetin_proto_rawDesc = "" +
@ -3803,13 +3847,16 @@ const file_olivetin_api_v1_olivetin_proto_rawDesc = "" +
"\x10GetEntityRequest\x12\x1d\n" +
"\n" +
"unique_key\x18\x01 \x01(\tR\tuniqueKey\x12\x12\n" +
"\x04type\x18\x02 \x01(\tR\x04type2\xa6\x11\n" +
"\x04type\x18\x02 \x01(\tR\x04type\"J\n" +
"\x14RestartActionRequest\x122\n" +
"\x15execution_tracking_id\x18\x01 \x01(\tR\x13executionTrackingId2\x86\x12\n" +
"\x12OliveTinApiService\x12]\n" +
"\fGetDashboard\x12$.olivetin.api.v1.GetDashboardRequest\x1a%.olivetin.api.v1.GetDashboardResponse\"\x00\x12Z\n" +
"\vStartAction\x12#.olivetin.api.v1.StartActionRequest\x1a$.olivetin.api.v1.StartActionResponse\"\x00\x12o\n" +
"\x12StartActionAndWait\x12*.olivetin.api.v1.StartActionAndWaitRequest\x1a+.olivetin.api.v1.StartActionAndWaitResponse\"\x00\x12i\n" +
"\x10StartActionByGet\x12(.olivetin.api.v1.StartActionByGetRequest\x1a).olivetin.api.v1.StartActionByGetResponse\"\x00\x12~\n" +
"\x17StartActionByGetAndWait\x12/.olivetin.api.v1.StartActionByGetAndWaitRequest\x1a0.olivetin.api.v1.StartActionByGetAndWaitResponse\"\x00\x12W\n" +
"\x17StartActionByGetAndWait\x12/.olivetin.api.v1.StartActionByGetAndWaitRequest\x1a0.olivetin.api.v1.StartActionByGetAndWaitResponse\"\x00\x12^\n" +
"\rRestartAction\x12%.olivetin.api.v1.RestartActionRequest\x1a$.olivetin.api.v1.StartActionResponse\"\x00\x12W\n" +
"\n" +
"KillAction\x12\".olivetin.api.v1.KillActionRequest\x1a#.olivetin.api.v1.KillActionResponse\"\x00\x12f\n" +
"\x0fExecutionStatus\x12'.olivetin.api.v1.ExecutionStatusRequest\x1a(.olivetin.api.v1.ExecutionStatusResponse\"\x00\x12N\n" +
@ -3842,7 +3889,7 @@ func file_olivetin_api_v1_olivetin_proto_rawDescGZIP() []byte {
return file_olivetin_api_v1_olivetin_proto_rawDescData
}
var file_olivetin_api_v1_olivetin_proto_msgTypes = make([]protoimpl.MessageInfo, 68)
var file_olivetin_api_v1_olivetin_proto_msgTypes = make([]protoimpl.MessageInfo, 69)
var file_olivetin_api_v1_olivetin_proto_goTypes = []any{
(*Action)(nil), // 0: olivetin.api.v1.Action
(*ActionArgument)(nil), // 1: olivetin.api.v1.ActionArgument
@ -3909,14 +3956,15 @@ var file_olivetin_api_v1_olivetin_proto_goTypes = []any{
(*GetEntitiesResponse)(nil), // 62: olivetin.api.v1.GetEntitiesResponse
(*EntityDefinition)(nil), // 63: olivetin.api.v1.EntityDefinition
(*GetEntityRequest)(nil), // 64: olivetin.api.v1.GetEntityRequest
nil, // 65: olivetin.api.v1.ActionArgument.SuggestionsEntry
nil, // 66: olivetin.api.v1.DumpVarsResponse.ContentsEntry
nil, // 67: olivetin.api.v1.DumpPublicIdActionMapResponse.ContentsEntry
(*RestartActionRequest)(nil), // 65: olivetin.api.v1.RestartActionRequest
nil, // 66: olivetin.api.v1.ActionArgument.SuggestionsEntry
nil, // 67: olivetin.api.v1.DumpVarsResponse.ContentsEntry
nil, // 68: olivetin.api.v1.DumpPublicIdActionMapResponse.ContentsEntry
}
var file_olivetin_api_v1_olivetin_proto_depIdxs = []int32{
1, // 0: olivetin.api.v1.Action.arguments:type_name -> olivetin.api.v1.ActionArgument
2, // 1: olivetin.api.v1.ActionArgument.choices:type_name -> olivetin.api.v1.ActionArgumentChoice
65, // 2: olivetin.api.v1.ActionArgument.suggestions:type_name -> olivetin.api.v1.ActionArgument.SuggestionsEntry
66, // 2: olivetin.api.v1.ActionArgument.suggestions:type_name -> olivetin.api.v1.ActionArgument.SuggestionsEntry
7, // 3: olivetin.api.v1.GetDashboardResponse.dashboard:type_name -> olivetin.api.v1.Dashboard
8, // 4: olivetin.api.v1.Dashboard.contents:type_name -> olivetin.api.v1.DashboardComponent
8, // 5: olivetin.api.v1.DashboardComponent.contents:type_name -> olivetin.api.v1.DashboardComponent
@ -3927,8 +3975,8 @@ var file_olivetin_api_v1_olivetin_proto_depIdxs = []int32{
19, // 10: olivetin.api.v1.StartActionByGetAndWaitResponse.log_entry:type_name -> olivetin.api.v1.LogEntry
19, // 11: olivetin.api.v1.GetLogsResponse.logs:type_name -> olivetin.api.v1.LogEntry
19, // 12: olivetin.api.v1.ExecutionStatusResponse.log_entry:type_name -> olivetin.api.v1.LogEntry
66, // 13: olivetin.api.v1.DumpVarsResponse.contents:type_name -> olivetin.api.v1.DumpVarsResponse.ContentsEntry
67, // 14: olivetin.api.v1.DumpPublicIdActionMapResponse.contents:type_name -> olivetin.api.v1.DumpPublicIdActionMapResponse.ContentsEntry
67, // 13: olivetin.api.v1.DumpVarsResponse.contents:type_name -> olivetin.api.v1.DumpVarsResponse.ContentsEntry
68, // 14: olivetin.api.v1.DumpPublicIdActionMapResponse.contents:type_name -> olivetin.api.v1.DumpPublicIdActionMapResponse.ContentsEntry
41, // 15: olivetin.api.v1.EventStreamResponse.entity_changed:type_name -> olivetin.api.v1.EventEntityChanged
42, // 16: olivetin.api.v1.EventStreamResponse.config_changed:type_name -> olivetin.api.v1.EventConfigChanged
43, // 17: olivetin.api.v1.EventStreamResponse.execution_finished:type_name -> olivetin.api.v1.EventExecutionFinished
@ -3948,49 +3996,51 @@ var file_olivetin_api_v1_olivetin_proto_depIdxs = []int32{
12, // 31: olivetin.api.v1.OliveTinApiService.StartActionAndWait:input_type -> olivetin.api.v1.StartActionAndWaitRequest
14, // 32: olivetin.api.v1.OliveTinApiService.StartActionByGet:input_type -> olivetin.api.v1.StartActionByGetRequest
16, // 33: olivetin.api.v1.OliveTinApiService.StartActionByGetAndWait:input_type -> olivetin.api.v1.StartActionByGetAndWaitRequest
45, // 34: olivetin.api.v1.OliveTinApiService.KillAction:input_type -> olivetin.api.v1.KillActionRequest
25, // 35: olivetin.api.v1.OliveTinApiService.ExecutionStatus:input_type -> olivetin.api.v1.ExecutionStatusRequest
18, // 36: olivetin.api.v1.OliveTinApiService.GetLogs:input_type -> olivetin.api.v1.GetLogsRequest
21, // 37: olivetin.api.v1.OliveTinApiService.ValidateArgumentType:input_type -> olivetin.api.v1.ValidateArgumentTypeRequest
27, // 38: olivetin.api.v1.OliveTinApiService.WhoAmI:input_type -> olivetin.api.v1.WhoAmIRequest
29, // 39: olivetin.api.v1.OliveTinApiService.SosReport:input_type -> olivetin.api.v1.SosReportRequest
31, // 40: olivetin.api.v1.OliveTinApiService.DumpVars:input_type -> olivetin.api.v1.DumpVarsRequest
34, // 41: olivetin.api.v1.OliveTinApiService.DumpPublicIdActionMap:input_type -> olivetin.api.v1.DumpPublicIdActionMapRequest
36, // 42: olivetin.api.v1.OliveTinApiService.GetReadyz:input_type -> olivetin.api.v1.GetReadyzRequest
47, // 43: olivetin.api.v1.OliveTinApiService.LocalUserLogin:input_type -> olivetin.api.v1.LocalUserLoginRequest
49, // 44: olivetin.api.v1.OliveTinApiService.PasswordHash:input_type -> olivetin.api.v1.PasswordHashRequest
51, // 45: olivetin.api.v1.OliveTinApiService.Logout:input_type -> olivetin.api.v1.LogoutRequest
38, // 46: olivetin.api.v1.OliveTinApiService.EventStream:input_type -> olivetin.api.v1.EventStreamRequest
53, // 47: olivetin.api.v1.OliveTinApiService.GetDiagnostics:input_type -> olivetin.api.v1.GetDiagnosticsRequest
55, // 48: olivetin.api.v1.OliveTinApiService.Init:input_type -> olivetin.api.v1.InitRequest
59, // 49: olivetin.api.v1.OliveTinApiService.GetActionBinding:input_type -> olivetin.api.v1.GetActionBindingRequest
61, // 50: olivetin.api.v1.OliveTinApiService.GetEntities:input_type -> olivetin.api.v1.GetEntitiesRequest
64, // 51: olivetin.api.v1.OliveTinApiService.GetEntity:input_type -> olivetin.api.v1.GetEntityRequest
4, // 52: olivetin.api.v1.OliveTinApiService.GetDashboard:output_type -> olivetin.api.v1.GetDashboardResponse
11, // 53: olivetin.api.v1.OliveTinApiService.StartAction:output_type -> olivetin.api.v1.StartActionResponse
13, // 54: olivetin.api.v1.OliveTinApiService.StartActionAndWait:output_type -> olivetin.api.v1.StartActionAndWaitResponse
15, // 55: olivetin.api.v1.OliveTinApiService.StartActionByGet:output_type -> olivetin.api.v1.StartActionByGetResponse
17, // 56: olivetin.api.v1.OliveTinApiService.StartActionByGetAndWait:output_type -> olivetin.api.v1.StartActionByGetAndWaitResponse
46, // 57: olivetin.api.v1.OliveTinApiService.KillAction:output_type -> olivetin.api.v1.KillActionResponse
26, // 58: olivetin.api.v1.OliveTinApiService.ExecutionStatus:output_type -> olivetin.api.v1.ExecutionStatusResponse
20, // 59: olivetin.api.v1.OliveTinApiService.GetLogs:output_type -> olivetin.api.v1.GetLogsResponse
22, // 60: olivetin.api.v1.OliveTinApiService.ValidateArgumentType:output_type -> olivetin.api.v1.ValidateArgumentTypeResponse
28, // 61: olivetin.api.v1.OliveTinApiService.WhoAmI:output_type -> olivetin.api.v1.WhoAmIResponse
30, // 62: olivetin.api.v1.OliveTinApiService.SosReport:output_type -> olivetin.api.v1.SosReportResponse
32, // 63: olivetin.api.v1.OliveTinApiService.DumpVars:output_type -> olivetin.api.v1.DumpVarsResponse
35, // 64: olivetin.api.v1.OliveTinApiService.DumpPublicIdActionMap:output_type -> olivetin.api.v1.DumpPublicIdActionMapResponse
37, // 65: olivetin.api.v1.OliveTinApiService.GetReadyz:output_type -> olivetin.api.v1.GetReadyzResponse
48, // 66: olivetin.api.v1.OliveTinApiService.LocalUserLogin:output_type -> olivetin.api.v1.LocalUserLoginResponse
50, // 67: olivetin.api.v1.OliveTinApiService.PasswordHash:output_type -> olivetin.api.v1.PasswordHashResponse
52, // 68: olivetin.api.v1.OliveTinApiService.Logout:output_type -> olivetin.api.v1.LogoutResponse
39, // 69: olivetin.api.v1.OliveTinApiService.EventStream:output_type -> olivetin.api.v1.EventStreamResponse
54, // 70: olivetin.api.v1.OliveTinApiService.GetDiagnostics:output_type -> olivetin.api.v1.GetDiagnosticsResponse
56, // 71: olivetin.api.v1.OliveTinApiService.Init:output_type -> olivetin.api.v1.InitResponse
60, // 72: olivetin.api.v1.OliveTinApiService.GetActionBinding:output_type -> olivetin.api.v1.GetActionBindingResponse
62, // 73: olivetin.api.v1.OliveTinApiService.GetEntities:output_type -> olivetin.api.v1.GetEntitiesResponse
3, // 74: olivetin.api.v1.OliveTinApiService.GetEntity:output_type -> olivetin.api.v1.Entity
52, // [52:75] is the sub-list for method output_type
29, // [29:52] is the sub-list for method input_type
65, // 34: olivetin.api.v1.OliveTinApiService.RestartAction:input_type -> olivetin.api.v1.RestartActionRequest
45, // 35: olivetin.api.v1.OliveTinApiService.KillAction:input_type -> olivetin.api.v1.KillActionRequest
25, // 36: olivetin.api.v1.OliveTinApiService.ExecutionStatus:input_type -> olivetin.api.v1.ExecutionStatusRequest
18, // 37: olivetin.api.v1.OliveTinApiService.GetLogs:input_type -> olivetin.api.v1.GetLogsRequest
21, // 38: olivetin.api.v1.OliveTinApiService.ValidateArgumentType:input_type -> olivetin.api.v1.ValidateArgumentTypeRequest
27, // 39: olivetin.api.v1.OliveTinApiService.WhoAmI:input_type -> olivetin.api.v1.WhoAmIRequest
29, // 40: olivetin.api.v1.OliveTinApiService.SosReport:input_type -> olivetin.api.v1.SosReportRequest
31, // 41: olivetin.api.v1.OliveTinApiService.DumpVars:input_type -> olivetin.api.v1.DumpVarsRequest
34, // 42: olivetin.api.v1.OliveTinApiService.DumpPublicIdActionMap:input_type -> olivetin.api.v1.DumpPublicIdActionMapRequest
36, // 43: olivetin.api.v1.OliveTinApiService.GetReadyz:input_type -> olivetin.api.v1.GetReadyzRequest
47, // 44: olivetin.api.v1.OliveTinApiService.LocalUserLogin:input_type -> olivetin.api.v1.LocalUserLoginRequest
49, // 45: olivetin.api.v1.OliveTinApiService.PasswordHash:input_type -> olivetin.api.v1.PasswordHashRequest
51, // 46: olivetin.api.v1.OliveTinApiService.Logout:input_type -> olivetin.api.v1.LogoutRequest
38, // 47: olivetin.api.v1.OliveTinApiService.EventStream:input_type -> olivetin.api.v1.EventStreamRequest
53, // 48: olivetin.api.v1.OliveTinApiService.GetDiagnostics:input_type -> olivetin.api.v1.GetDiagnosticsRequest
55, // 49: olivetin.api.v1.OliveTinApiService.Init:input_type -> olivetin.api.v1.InitRequest
59, // 50: olivetin.api.v1.OliveTinApiService.GetActionBinding:input_type -> olivetin.api.v1.GetActionBindingRequest
61, // 51: olivetin.api.v1.OliveTinApiService.GetEntities:input_type -> olivetin.api.v1.GetEntitiesRequest
64, // 52: olivetin.api.v1.OliveTinApiService.GetEntity:input_type -> olivetin.api.v1.GetEntityRequest
4, // 53: olivetin.api.v1.OliveTinApiService.GetDashboard:output_type -> olivetin.api.v1.GetDashboardResponse
11, // 54: olivetin.api.v1.OliveTinApiService.StartAction:output_type -> olivetin.api.v1.StartActionResponse
13, // 55: olivetin.api.v1.OliveTinApiService.StartActionAndWait:output_type -> olivetin.api.v1.StartActionAndWaitResponse
15, // 56: olivetin.api.v1.OliveTinApiService.StartActionByGet:output_type -> olivetin.api.v1.StartActionByGetResponse
17, // 57: olivetin.api.v1.OliveTinApiService.StartActionByGetAndWait:output_type -> olivetin.api.v1.StartActionByGetAndWaitResponse
11, // 58: olivetin.api.v1.OliveTinApiService.RestartAction:output_type -> olivetin.api.v1.StartActionResponse
46, // 59: olivetin.api.v1.OliveTinApiService.KillAction:output_type -> olivetin.api.v1.KillActionResponse
26, // 60: olivetin.api.v1.OliveTinApiService.ExecutionStatus:output_type -> olivetin.api.v1.ExecutionStatusResponse
20, // 61: olivetin.api.v1.OliveTinApiService.GetLogs:output_type -> olivetin.api.v1.GetLogsResponse
22, // 62: olivetin.api.v1.OliveTinApiService.ValidateArgumentType:output_type -> olivetin.api.v1.ValidateArgumentTypeResponse
28, // 63: olivetin.api.v1.OliveTinApiService.WhoAmI:output_type -> olivetin.api.v1.WhoAmIResponse
30, // 64: olivetin.api.v1.OliveTinApiService.SosReport:output_type -> olivetin.api.v1.SosReportResponse
32, // 65: olivetin.api.v1.OliveTinApiService.DumpVars:output_type -> olivetin.api.v1.DumpVarsResponse
35, // 66: olivetin.api.v1.OliveTinApiService.DumpPublicIdActionMap:output_type -> olivetin.api.v1.DumpPublicIdActionMapResponse
37, // 67: olivetin.api.v1.OliveTinApiService.GetReadyz:output_type -> olivetin.api.v1.GetReadyzResponse
48, // 68: olivetin.api.v1.OliveTinApiService.LocalUserLogin:output_type -> olivetin.api.v1.LocalUserLoginResponse
50, // 69: olivetin.api.v1.OliveTinApiService.PasswordHash:output_type -> olivetin.api.v1.PasswordHashResponse
52, // 70: olivetin.api.v1.OliveTinApiService.Logout:output_type -> olivetin.api.v1.LogoutResponse
39, // 71: olivetin.api.v1.OliveTinApiService.EventStream:output_type -> olivetin.api.v1.EventStreamResponse
54, // 72: olivetin.api.v1.OliveTinApiService.GetDiagnostics:output_type -> olivetin.api.v1.GetDiagnosticsResponse
56, // 73: olivetin.api.v1.OliveTinApiService.Init:output_type -> olivetin.api.v1.InitResponse
60, // 74: olivetin.api.v1.OliveTinApiService.GetActionBinding:output_type -> olivetin.api.v1.GetActionBindingResponse
62, // 75: olivetin.api.v1.OliveTinApiService.GetEntities:output_type -> olivetin.api.v1.GetEntitiesResponse
3, // 76: olivetin.api.v1.OliveTinApiService.GetEntity:output_type -> olivetin.api.v1.Entity
53, // [53:77] is the sub-list for method output_type
29, // [29:53] is the sub-list for method input_type
29, // [29:29] is the sub-list for extension type_name
29, // [29:29] is the sub-list for extension extendee
0, // [0:29] is the sub-list for field type_name
@ -4014,7 +4064,7 @@ func file_olivetin_api_v1_olivetin_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: unsafe.Slice(unsafe.StringData(file_olivetin_api_v1_olivetin_proto_rawDesc), len(file_olivetin_api_v1_olivetin_proto_rawDesc)),
NumEnums: 0,
NumMessages: 68,
NumMessages: 69,
NumExtensions: 0,
NumServices: 1,
},

54
service/internal/api/api.go
View File

@ -49,7 +49,7 @@ func (api *oliveTinAPI) KillAction(ctx ctx.Context, req *connect.Request[apiv1.K
log.Warnf("Killing execution request by tracking ID: %v", req.Msg.ExecutionTrackingId)
action := api.cfg.FindAction(execReqLogEntry.ActionTitle)
action := execReqLogEntry.Binding.Action
if action == nil {
log.Warnf("Killing execution request not possible - action not found: %v", execReqLogEntry.ActionTitle)
@ -97,8 +97,7 @@ func (api *oliveTinAPI) StartAction(ctx ctx.Context, req *connect.Request[apiv1.
authenticatedUser := acl.UserFromContext(ctx, api.cfg)
execReq := executor.ExecutionRequest{
Action: pair.Action,
Entity: pair.Entity,
Binding: pair,
TrackingID: req.Msg.UniqueTrackingId,
Arguments: args,
AuthenticatedUser: authenticatedUser,
@ -132,7 +131,7 @@ func (api *oliveTinAPI) LocalUserLogin(ctx ctx.Context, req *connect.Request[api
match := checkUserPassword(api.cfg, req.Msg.Username, req.Msg.Password)
if match {
//grpc.SendHeader(ctx, metadata.Pairs("set-username", req.Username))
// grpc.SendHeader(ctx, metadata.Pairs("set-username", req.Username))
log.WithFields(log.Fields{
"username": req.Msg.Username,
@ -158,7 +157,7 @@ func (api *oliveTinAPI) StartActionAndWait(ctx ctx.Context, req *connect.Request
user := acl.UserFromContext(ctx, api.cfg)
execReq := executor.ExecutionRequest{
Action: api.executor.FindActionByBindingID(req.Msg.ActionId),
Binding: api.executor.FindBindingByID(req.Msg.ActionId),
TrackingID: uuid.NewString(),
Arguments: args,
AuthenticatedUser: user,
@ -183,7 +182,7 @@ func (api *oliveTinAPI) StartActionByGet(ctx ctx.Context, req *connect.Request[a
args := make(map[string]string)
execReq := executor.ExecutionRequest{
Action: api.executor.FindActionByBindingID(req.Msg.ActionId),
Binding: api.executor.FindBindingByID(req.Msg.ActionId),
TrackingID: uuid.NewString(),
Arguments: args,
AuthenticatedUser: acl.UserFromContext(ctx, api.cfg),
@ -203,7 +202,7 @@ func (api *oliveTinAPI) StartActionByGetAndWait(ctx ctx.Context, req *connect.Re
user := acl.UserFromContext(ctx, api.cfg)
execReq := executor.ExecutionRequest{
Action: api.executor.FindActionByBindingID(req.Msg.ActionId),
Binding: api.executor.FindBindingByID(req.Msg.ActionId),
TrackingID: uuid.NewString(),
Arguments: args,
AuthenticatedUser: user,
@ -244,7 +243,7 @@ func (api *oliveTinAPI) internalLogEntryToPb(logEntry *executor.InternalLogEntry
}
if !pble.ExecutionFinished {
pble.CanKill = acl.IsAllowedKill(api.cfg, authenticatedUser, api.cfg.FindAction(logEntry.ActionConfigTitle))
pble.CanKill = acl.IsAllowedKill(api.cfg, authenticatedUser, logEntry.Binding.Action)
}
return pble
@ -299,10 +298,10 @@ func (api *oliveTinAPI) ExecutionStatus(ctx ctx.Context, req *connect.Request[ap
}
func (api *oliveTinAPI) Logout(ctx ctx.Context, req *connect.Request[apiv1.LogoutRequest]) (*connect.Response[apiv1.LogoutResponse], error) {
//user := acl.UserFromContext(ctx, cfg)
// user := acl.UserFromContext(ctx, cfg)
//grpc.SendHeader(ctx, metadata.Pairs("logout-provider", user.Provider))
//grpc.SendHeader(ctx, metadata.Pairs("logout-sid", user.SID))
// grpc.SendHeader(ctx, metadata.Pairs("logout-provider", user.Provider))
// grpc.SendHeader(ctx, metadata.Pairs("logout-sid", user.SID))
return nil, nil
}
@ -353,7 +352,7 @@ func (api *oliveTinAPI) GetLogs(ctx ctx.Context, req *connect.Request[apiv1.GetL
logEntries, pagingResult := api.executor.GetLogTrackingIds(req.Msg.StartOffset, api.cfg.LogHistoryPageSize)
for _, logEntry := range logEntries {
action := api.cfg.FindAction(logEntry.ActionTitle)
action := logEntry.Binding.Action
if action == nil || acl.IsAllowedLogs(api.cfg, user, action) {
pbLogEntry := api.internalLogEntryToPb(logEntry, user)
@ -699,6 +698,37 @@ func (api *oliveTinAPI) GetEntity(ctx ctx.Context, req *connect.Request[apiv1.Ge
}
}
func (api *oliveTinAPI) RestartAction(ctx ctx.Context, req *connect.Request[apiv1.RestartActionRequest]) (*connect.Response[apiv1.StartActionResponse], error) {
ret := &apiv1.StartActionResponse{
ExecutionTrackingId: req.Msg.ExecutionTrackingId,
}
var execReqLogEntry *executor.InternalLogEntry
execReqLogEntry, found := api.executor.GetLog(req.Msg.ExecutionTrackingId)
if !found {
log.Warnf("Restarting execution request not possible - not found by tracking ID: %v", req.Msg.ExecutionTrackingId)
return connect.NewResponse(ret), nil
}
log.Warnf("Restarting execution request by tracking ID: %v", req.Msg.ExecutionTrackingId)
action := execReqLogEntry.Binding.Action
if action == nil {
log.Warnf("Restarting execution request not possible - action not found: %v", execReqLogEntry.ActionTitle)
return connect.NewResponse(ret), nil
}
return api.StartAction(ctx, &connect.Request[apiv1.StartActionRequest]{
Msg: &apiv1.StartActionRequest{
// FIXME
UniqueTrackingId: req.Msg.ExecutionTrackingId,
},
})
}
func newServer(ex *executor.Executor) *oliveTinAPI {
server := oliveTinAPI{}
server.cfg = ex.Cfg

19
service/internal/api/api_test.go
View File

@ -1,8 +1,8 @@
package api
import (
"context"
"connectrpc.com/connect"
"context"
"github.com/stretchr/testify/assert"
"testing"
@ -34,14 +34,13 @@ func getNewTestServerAndClient(t *testing.T, injectedConfig *config.Config) (*ht
log.Infof("API path is %s", path)
httpclient := &http.Client{
}
httpclient := &http.Client{}
ts := httptest.NewServer(mux)
client := apiv1connect.NewOliveTinApiServiceClient(httpclient, ts.URL + "/api")
client := apiv1connect.NewOliveTinApiServiceClient(httpclient, ts.URL+"/api")
log.Infof("Test server URL is %s", ts.URL + path)
log.Infof("Test server URL is %s", ts.URL+path)
return ts, client
}
@ -60,7 +59,7 @@ func TestGetActionsAndStart(t *testing.T) {
conn, client := getNewTestServerAndClient(t, cfg)
respGb, err := client.GetDashboardComponents(context.Background(), connect.NewRequest(&apiv1.GetDashboardComponentsRequest{}))
respInit, err := client.Init(context.Background(), connect.NewRequest(&apiv1.InitRequest{}))
respGetReady, err := client.GetReadyz(context.Background(), connect.NewRequest(&apiv1.GetReadyzRequest{}))
if err != nil {
@ -72,11 +71,13 @@ func TestGetActionsAndStart(t *testing.T) {
assert.Equal(t, true, true, "sayHello Failed")
// assert.Equal(t, 1, len(respGb.Msg.Actions), "Got 1 action button back")
// assert.Equal(t, 1, len(respGb.Msg.Actions), "Got 1 action button back")
log.Printf("Response: %+v", respGb)
log.Printf("Response: %+v", respInit)
respSa, err := client.StartAction(context.Background(), connect.NewRequest(&apiv1.StartActionRequest{ActionId: "blat"}))
respSa, err := client.StartAction(context.Background(), connect.NewRequest(&apiv1.StartActionRequest{
// ActionId: "blat"
}))
assert.NotNil(t, err, "Error 404 after start action")
assert.Nil(t, respSa, "Nil response for non existing action")

1
service/internal/api/dashboards.go
View File

@ -37,6 +37,7 @@ func dashboardCfgToPb(rr *DashboardRenderRequest, dashboardTitle string) *apiv1.
return nil
}
//gocyclo:ignore
func buildDefaultDashboard(rr *DashboardRenderRequest) *apiv1.Dashboard {
fieldset := &apiv1.DashboardComponent{
Type: "fieldset",

2
service/internal/config/config_helpers.go
View File

@ -1,7 +1,7 @@
package config
// FindAction will return a action if there is a match on Title
func (cfg *Config) FindAction(actionTitle string) *Action {
func (cfg *Config) findAction(actionTitle string) *Action {
for _, action := range cfg.Actions {
if action.Title == actionTitle {
return action

10
service/internal/config/config_helpers_test.go
View File

@ -23,13 +23,13 @@ func TestFindAction(t *testing.T) {
c.Actions = append(c.Actions, a2)
assert.NotNil(t, c.FindAction("a1"), "Find action a1")
assert.NotNil(t, c.findAction("a1"), "Find action a1")
assert.NotNil(t, c.FindAction("a2"), "Find action a2")
assert.NotNil(t, c.FindAction("a2").FindArg("Blat"), "Find action argument")
assert.Nil(t, c.FindAction("a2").FindArg("Blatey Cake"), "Find non-existent action argument")
assert.NotNil(t, c.findAction("a2"), "Find action a2")
assert.NotNil(t, c.findAction("a2").FindArg("Blat"), "Find action argument")
assert.Nil(t, c.findAction("a2").FindArg("Blatey Cake"), "Find non-existent action argument")
assert.Nil(t, c.FindAction("waffles"), "Find non-existent action")
assert.Nil(t, c.findAction("waffles"), "Find non-existent action")
}
func TestFindAcl(t *testing.T) {

2
service/internal/config/sanitize_test.go
View File

@ -28,7 +28,7 @@ func TestSanitizeConfig(t *testing.T) {
c.Actions = append(c.Actions, a)
c.Sanitize()
a2 := c.FindAction("Mr Waffles")
a2 := c.findAction("Mr Waffles")
assert.NotNil(t, a2, "Found action after adding it")
assert.Equal(t, 3, a2.Timeout, "Default timeout is set")

1
service/internal/entities/entities.go
View File

@ -174,4 +174,3 @@ func serializeSliceToSv(prefix string, s []any) {
}
}
*/

9
service/internal/entities/entities_test.go
View File

@ -1,17 +1,18 @@
package entities
import (
sv "github.com/OliveTin/OliveTin/internal/stringvariables"
"github.com/stretchr/testify/assert"
// "github.com/stretchr/testify/assert"
"testing"
)
func TestLoadObjectPerLineJsonFile(t *testing.T) {
/*
filename := "testdata/object-per-line.json"
assert.Equal(t, "", sv.Get("entities.testrow.0.val"), "Value should match expected value")
assert.Equal(t, "", GetEntity("testrow", "0"), "Value should match expected value")
loadEntityFileJson(filename, "testrow")
assert.Equal(t, "1234567890", sv.Get("entities.testrow.0.val"), "Value should match expected value")
assert.Equal(t, "1234567890", GetEntity("testrow", "0"), "Value should match expected value")
*/
}

3
service/internal/entities/storage.go
View File

@ -78,7 +78,7 @@ func AddEntity(entityName string, entityKey string, data any) {
contents.Entities[entityName] = make(entityInstancesByKey, 0)
}
contents.Entities[entityName][entityKey] = &Entity {
contents.Entities[entityName][entityKey] = &Entity{
Data: data,
UniqueKey: entityKey,
Title: findEntityTitle(data),
@ -87,6 +87,7 @@ func AddEntity(entityName string, entityKey string, data any) {
rwmutex.Unlock()
}
//gocyclo:ignore
func findEntityTitle(data any) string {
if mapData, ok := data.(map[string]any); ok {
keys := make(map[string]string)

4
service/internal/entities/templates.go
View File

@ -23,7 +23,7 @@ func migrateLegacyArgumentNames(rawShellCommand string) string {
if strings.Contains(argName, ".") {
replacement := ".CurrentEntity"
rawShellCommand = strings.Replace(rawShellCommand, entityName, replacement, -1)
rawShellCommand = strings.ReplaceAll(rawShellCommand, entityName, replacement)
log.WithFields(log.Fields{
"old": entityName,
@ -38,7 +38,7 @@ func migrateLegacyArgumentNames(rawShellCommand string) string {
"new": ".Arguments." + argName,
}).Warnf("Legacy variable name found, changing to Argument")
rawShellCommand = strings.Replace(rawShellCommand, argName, ".Arguments."+argName, -1)
rawShellCommand = strings.ReplaceAll(rawShellCommand, argName, ".Arguments."+argName)
}
}

12
service/internal/executor/arguments.go
View File

@ -42,13 +42,13 @@ func parseCommandForReplacements(shellCommand string, values map[string]string,
return shellCommand, nil
}
func parseActionArguments(rawShellCommand string, values map[string]string, action *config.Action, entity *entities.Entity) (string, error) {
func parseActionArguments(values map[string]string, action *config.Action, entity *entities.Entity) (string, error) {
log.WithFields(log.Fields{
"actionTitle": action.Title,
"cmd": action.Shell,
}).Infof("Action parse args - Before")
rawShellCommand, err := parseCommandForReplacements(rawShellCommand, values, entity)
rawShellCommand, err := parseCommandForReplacements(action.Shell, values, entity)
for _, arg := range action.Arguments {
argName := arg.Name
@ -244,7 +244,7 @@ func typeSafetyCheckUrl(value string) error {
}
func mangleInvalidArgumentValues(req *ExecutionRequest) {
for _, arg := range req.Action.Arguments {
for _, arg := range req.Binding.Action.Arguments {
if arg.Type == "datetime" {
mangleInvalidDatetimeValues(req, &arg)
}
@ -258,7 +258,7 @@ func mangleCheckboxValues(req *ExecutionRequest, arg *config.ActionArgument) {
return
}
log.Infof("Checking checkbox values for argument %s in action %s", arg.Name, req.Action.Title)
log.Infof("Checking checkbox values for argument %s in action %s", arg.Name, req.Binding.Action.Title)
for i, _ := range arg.Choices {
choice := &arg.Choices[i]
@ -268,7 +268,7 @@ func mangleCheckboxValues(req *ExecutionRequest, arg *config.ActionArgument) {
"arg": arg.Name,
"oldValue": req.Arguments[arg.Name],
"newValue": choice.Value,
"actionTitle": req.Action.Title,
"actionTitle": req.Binding.Action.Title,
}).Infof("Mangled checkbox value")
req.Arguments[arg.Name] = choice.Value
@ -289,7 +289,7 @@ func mangleInvalidDatetimeValues(req *ExecutionRequest, arg *config.ActionArgume
log.WithFields(log.Fields{
"arg": arg.Name,
"value": value,
"actionTitle": req.Action.Title,
"actionTitle": req.Binding.Action.Title,
}).Warnf("Mangled invalid datetime value without seconds to :00 seconds, this issue is commonly caused by Android browsers.")
req.Arguments[arg.Name] = timestamp.Format("2006-01-02T15:04:05")

19
service/internal/executor/arguments_test.go
View File

@ -5,6 +5,7 @@ import (
"strings"
config "github.com/OliveTin/OliveTin/internal/config"
"github.com/OliveTin/OliveTin/internal/entities"
"github.com/stretchr/testify/assert"
"testing"
@ -36,14 +37,14 @@ func TestArgumentValueNullable(t *testing.T) {
"count": "",
}
out, err := parseActionArguments(values, &a1, "")
out, err := parseActionArguments(values, &a1, nil)
assert.Equal(t, "echo 'Releasing hounds'", out)
assert.Nil(t, err)
a1.Arguments[0].RejectNull = true
_, err = parseActionArguments(values, &a1, "")
_, err = parseActionArguments(values, &a1, nil)
assert.NotNil(t, err)
}
@ -64,7 +65,7 @@ func TestArgumentNameNumbers(t *testing.T) {
"person1name": "Fred",
}
out, err := parseActionArguments(values, &a1, "")
out, err := parseActionArguments(values, &a1, nil)
assert.Equal(t, "echo 'Tickling Fred'", out)
assert.Nil(t, err)
@ -84,7 +85,7 @@ func TestArgumentNotProvided(t *testing.T) {
values := map[string]string{}
out, err := parseActionArguments(values, &a1, "")
out, err := parseActionArguments(values, &a1, nil)
assert.Equal(t, "", out)
assert.Equal(t, err.Error(), "required arg not provided: personName")
@ -418,7 +419,7 @@ func TestParseCommandForReplacements(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
output, err := parseCommandForReplacements(tt.shellCommand, tt.values)
output, err := parseCommandForReplacements(tt.shellCommand, tt.values, nil)
if tt.expectError {
assert.NotNil(t, err, "Expected error but got none")
@ -485,7 +486,7 @@ func TestArgumentChoicesValidation(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
_, err := parseActionArguments(tt.values, &tt.action, "")
_, err := parseActionArguments(tt.values, &tt.action, nil)
if tt.expectError {
assert.NotNil(t, err, tt.description)
@ -531,8 +532,12 @@ func TestParseActionArgumentsWithEntityPrefix(t *testing.T) {
"name": "testuser",
}
ent := &entities.Entity{
Title: "entity_123",
}
// Test with entity prefix
output, err := parseActionArguments(values, &action, "entity_123")
output, err := parseActionArguments(values, &action, ent)
assert.Nil(t, err)
assert.Contains(t, output, "testuser")
}

80
service/internal/executor/executor.go
View File

@ -60,16 +60,14 @@ type Executor struct {
}
// ExecutionRequest is a request to execute an action. It's passed to an
// Executor. They're created from the grpcapi.
// Executor. They're created from the api.
type ExecutionRequest struct {
ActionTitle string
Action *config.Action
Binding *ActionBinding
Arguments map[string]string
TrackingID string
Tags []string
Cfg *config.Config
AuthenticatedUser *acl.AuthenticatedUser
Entity *entities.Entity
TriggerDepth int
logEntry *InternalLogEntry
@ -81,6 +79,8 @@ type ExecutionRequest struct {
// state of execution (even if the command is not executed). It's designed to be
// easily serializable.
type InternalLogEntry struct {
Binding *ActionBinding
BindingID string
DatetimeStarted time.Time
DatetimeFinished time.Time
Output string
@ -263,6 +263,7 @@ func (e *Executor) ExecRequest(req *ExecutionRequest) (*sync.WaitGroup, string)
req.executor = e
req.logEntry = &InternalLogEntry{
Binding: req.Binding,
DatetimeStarted: time.Now(),
ExecutionTrackingID: req.TrackingID,
Output: "",
@ -315,7 +316,7 @@ func getConcurrentCount(req *ExecutionRequest) int {
req.executor.logmutex.RLock()
for _, log := range req.executor.GetLogsByActionId(req.Action.ID) {
for _, log := range req.executor.GetLogsByActionId(req.Binding.Action.ID) {
if !log.ExecutionFinished {
concurrentCount += 1
}
@ -330,11 +331,11 @@ func stepConcurrencyCheck(req *ExecutionRequest) bool {
concurrentCount := getConcurrentCount(req)
// Note that the current execution is counted int the logs, so when checking we +1
if concurrentCount >= (req.Action.MaxConcurrent + 1) {
if concurrentCount >= (req.Binding.Action.MaxConcurrent + 1) {
log.WithFields(log.Fields{
"actionTitle": req.logEntry.ActionTitle,
"concurrentCount": concurrentCount,
"maxConcurrent": req.Action.MaxConcurrent,
"maxConcurrent": req.Binding.Action.MaxConcurrent,
}).Warnf("Blocked from executing due to concurrency limit")
req.logEntry.Output = "Blocked from executing due to concurrency limit"
@ -365,7 +366,7 @@ func getExecutionsCount(rate config.RateSpec, req *ExecutionRequest) int {
then := time.Now().Add(-duration)
for _, logEntry := range req.executor.GetLogsByActionId(req.Action.ID) {
for _, logEntry := range req.executor.GetLogsByActionId(req.Binding.Action.ID) {
// FIXME
/*
if logEntry.EntityPrefix != req.EntityPrefix {
@ -383,7 +384,7 @@ func getExecutionsCount(rate config.RateSpec, req *ExecutionRequest) int {
}
func stepRateCheck(req *ExecutionRequest) bool {
for _, rate := range req.Action.MaxRate {
for _, rate := range req.Binding.Action.MaxRate {
executions := getExecutionsCount(rate, req)
if executions >= rate.Limit {
@ -404,7 +405,7 @@ func stepRateCheck(req *ExecutionRequest) bool {
}
func stepACLCheck(req *ExecutionRequest) bool {
canExec := acl.IsAllowedExec(req.Cfg, req.AuthenticatedUser, req.Action)
canExec := acl.IsAllowedExec(req.Cfg, req.AuthenticatedUser, req.Binding.Action)
if !canExec {
req.logEntry.Output = "ACL check failed. Blocked from executing."
@ -430,7 +431,7 @@ func stepParseArgs(req *ExecutionRequest) bool {
mangleInvalidArgumentValues(req)
req.finalParsedCommand, err = parseActionArguments(req.Action.Shell, req.Arguments, req.Action, req.Entity)
req.finalParsedCommand, err = parseActionArguments(req.Arguments, req.Binding.Action, req.Binding.Entity)
if err != nil {
req.logEntry.Output = err.Error()
@ -444,40 +445,21 @@ func stepParseArgs(req *ExecutionRequest) bool {
}
func stepRequestAction(req *ExecutionRequest) bool {
// The grpc API always tries to find the action by ID, but it may
if req.Action == nil {
log.WithFields(log.Fields{
"actionTitle": req.ActionTitle,
}).Infof("Action finding by title")
req.Action = req.Cfg.FindAction(req.ActionTitle)
if req.Action == nil {
log.WithFields(log.Fields{
"actionTitle": req.ActionTitle,
}).Warnf("Action requested, but not found")
req.logEntry.Output = "Action not found: " + req.ActionTitle
return false
}
}
metricActionsRequested.Inc()
req.logEntry.ActionConfigTitle = req.Action.Title
req.logEntry.ActionTitle = entities.ParseTemplateWith(req.Action.Title, req.Entity)
req.logEntry.ActionIcon = req.Action.Icon
req.logEntry.ActionId = req.Action.ID
req.logEntry.ActionConfigTitle = req.Binding.Action.Title
req.logEntry.ActionTitle = entities.ParseTemplateWith(req.Binding.Action.Title, req.Binding.Entity)
req.logEntry.ActionIcon = req.Binding.Action.Icon
req.logEntry.ActionId = req.Binding.Action.ID
req.logEntry.Tags = req.Tags
req.executor.logmutex.Lock()
if _, containsKey := req.executor.LogsByActionId[req.Action.ID]; !containsKey {
req.executor.LogsByActionId[req.Action.ID] = make([]*InternalLogEntry, 0)
if _, containsKey := req.executor.LogsByActionId[req.Binding.Action.ID]; !containsKey {
req.executor.LogsByActionId[req.Binding.Action.ID] = make([]*InternalLogEntry, 0)
}
req.executor.LogsByActionId[req.Action.ID] = append(req.executor.LogsByActionId[req.Action.ID], req.logEntry)
req.executor.LogsByActionId[req.Binding.Action.ID] = append(req.executor.LogsByActionId[req.Binding.Action.ID], req.logEntry)
req.executor.logmutex.Unlock()
@ -494,7 +476,7 @@ func stepRequestAction(req *ExecutionRequest) bool {
func stepLogStart(req *ExecutionRequest) bool {
log.WithFields(log.Fields{
"actionTitle": req.logEntry.ActionTitle,
"timeout": req.Action.Timeout,
"timeout": req.Binding.Action.Timeout,
}).Infof("Action started")
return true
@ -566,7 +548,7 @@ func buildEnv(args map[string]string) []string {
}
func stepExec(req *ExecutionRequest) bool {
ctx, cancel := context.WithTimeout(context.Background(), time.Duration(req.Action.Timeout)*time.Second)
ctx, cancel := context.WithTimeout(context.Background(), time.Duration(req.Binding.Action.Timeout)*time.Second)
defer cancel()
streamer := &OutputStreamer{Req: req}
@ -605,7 +587,7 @@ func stepExec(req *ExecutionRequest) bool {
}
req.logEntry.TimedOut = true
req.logEntry.Output += "OliveTin::timeout - this action timed out after " + fmt.Sprintf("%v", req.Action.Timeout) + " seconds. If you need more time for this action, set a longer timeout. See https://docs.olivetin.app/timeout.html for more help."
req.logEntry.Output += "OliveTin::timeout - this action timed out after " + fmt.Sprintf("%v", req.Binding.Action.Timeout) + " seconds. If you need more time for this action, set a longer timeout. See https://docs.olivetin.app/timeout.html for more help."
}
req.logEntry.DatetimeFinished = time.Now()
@ -614,11 +596,11 @@ func stepExec(req *ExecutionRequest) bool {
}
func stepExecAfter(req *ExecutionRequest) bool {
if req.Action.ShellAfterCompleted == "" {
if req.Binding.Action.ShellAfterCompleted == "" {
return true
}
ctx, cancel := context.WithTimeout(context.Background(), time.Duration(req.Action.Timeout)*time.Second)
ctx, cancel := context.WithTimeout(context.Background(), time.Duration(req.Binding.Action.Timeout)*time.Second)
defer cancel()
var stdout bytes.Buffer
@ -631,7 +613,7 @@ func stepExecAfter(req *ExecutionRequest) bool {
"ot_username": req.AuthenticatedUser.Username,
}
finalParsedCommand, err := parseCommandForReplacements(req.Action.ShellAfterCompleted, args, req.Entity)
finalParsedCommand, err := parseCommandForReplacements(req.Binding.Action.ShellAfterCompleted, args, req.Binding.Entity)
if err != nil {
msg := "Could not prepare shellAfterCompleted command: " + err.Error() + "\n"
@ -672,8 +654,9 @@ func stepExecAfter(req *ExecutionRequest) bool {
return true
}
//gocyclo:ignore
func stepTrigger(req *ExecutionRequest) bool {
if req.Action.Triggers == nil {
if req.Binding.Action.Triggers == nil {
return true
}
@ -696,9 +679,10 @@ func stepTrigger(req *ExecutionRequest) bool {
}
func triggerLoop(req *ExecutionRequest) {
for _, triggerReq := range req.Action.Triggers {
for _, triggerReq := range req.Binding.Action.Triggers {
binding := req.executor.FindBindingByID(triggerReq)
trigger := &ExecutionRequest{
ActionTitle: triggerReq,
Binding: binding,
TrackingID: uuid.NewString(),
Tags: []string{"trigger"},
AuthenticatedUser: req.AuthenticatedUser,
@ -729,7 +713,7 @@ func firstNonEmpty(one, two string) string {
}
func saveLogResults(req *ExecutionRequest, filename string) {
dir := firstNonEmpty(req.Action.SaveLogs.ResultsDirectory, req.Cfg.SaveLogs.ResultsDirectory)
dir := firstNonEmpty(req.Binding.Action.SaveLogs.ResultsDirectory, req.Cfg.SaveLogs.ResultsDirectory)
if dir != "" {
data, err := yaml.Marshal(req.logEntry)
@ -748,7 +732,7 @@ func saveLogResults(req *ExecutionRequest, filename string) {
}
func saveLogOutput(req *ExecutionRequest, filename string) {
dir := firstNonEmpty(req.Action.SaveLogs.OutputDirectory, req.Cfg.SaveLogs.OutputDirectory)
dir := firstNonEmpty(req.Binding.Action.SaveLogs.OutputDirectory, req.Cfg.SaveLogs.OutputDirectory)
if dir != "" {
data := req.logEntry.Output

25
service/internal/executor/executor_actions.go
View File

@ -10,16 +10,6 @@ import (
log "github.com/sirupsen/logrus"
)
func (e *Executor) FindActionByBindingID(id string) *config.Action {
binding := e.FindBindingByID(id)
if binding == nil {
return nil
}
return binding.Action
}
func (e *Executor) FindBindingByID(id string) *ActionBinding {
e.MapActionIdToBindingLock.RLock()
pair, found := e.MapActionIdToBinding[id]
@ -32,6 +22,20 @@ func (e *Executor) FindBindingByID(id string) *ActionBinding {
return pair
}
func (e *Executor) FindBindingWithNoEntity(action *config.Action) *ActionBinding {
e.MapActionIdToBindingLock.RLock()
defer e.MapActionIdToBindingLock.RUnlock()
for _, binding := range e.MapActionIdToBinding {
if binding.Action == action && binding.Entity == nil {
return binding
}
}
return nil
}
type RebuildActionMapRequest struct {
Cfg *config.Config
DashboardActionTitles []string
@ -72,6 +76,7 @@ func findDashboardActionTitles(req *RebuildActionMapRequest) {
}
}
//gocyclo:ignore
func recurseDashboardForActionTitles(component *config.DashboardComponent, req *RebuildActionMapRequest) {
for _, sub := range component.Contents {
if sub.Type == "link" || sub.Type == "" {

15
service/internal/executor/executor_test.go
View File

@ -34,7 +34,6 @@ func TestCreateExecutorAndExec(t *testing.T) {
e, cfg := testingExecutor()
req := ExecutionRequest{
ActionTitle: "Do some tickles",
AuthenticatedUser: &acl.AuthenticatedUser{Username: "Mr Tickle"},
Cfg: cfg,
Arguments: map[string]string{
@ -54,7 +53,7 @@ func TestExecNonExistant(t *testing.T) {
e, cfg := testingExecutor()
req := ExecutionRequest{
ActionTitle: "Waffles",
// Binding: e.FindBindingWithNoEntity("waffles"),
logEntry: &InternalLogEntry{},
Cfg: cfg,
}
@ -82,7 +81,7 @@ func TestArgumentNameCamelCase(t *testing.T) {
"personName": "Fred",
}
out, err := parseActionArguments(values, a1, "")
out, err := parseActionArguments(values, a1, nil)
assert.Equal(t, "echo 'Tickling Fred'", out)
assert.Nil(t, err)
@ -104,7 +103,7 @@ func TestArgumentNameSnakeCase(t *testing.T) {
"person_name": "Fred",
}
out, err := parseActionArguments(values, a1, "")
out, err := parseActionArguments(values, a1, nil)
assert.Equal(t, "echo 'Tickling Fred'", out)
assert.Nil(t, err)
@ -165,7 +164,7 @@ func TestGetLogsLessThanPageSize(t *testing.T) {
func execNewReqAndWait(e *Executor, title string, cfg *config.Config) {
req := &ExecutionRequest{
ActionTitle: title,
// ActionTitle: title,
Cfg: cfg,
}
@ -195,7 +194,7 @@ func TestUnsetRequiredArgument(t *testing.T) {
values := map[string]string{}
out, err := parseActionArguments(values, a1, "")
out, err := parseActionArguments(values, a1, nil)
assert.Equal(t, "", out)
assert.NotNil(t, err)
@ -222,7 +221,7 @@ func TestUnusedArgumentStillPassesTypeSafetyCheck(t *testing.T) {
"age": "Not an integer",
}
out, err := parseActionArguments(values, a1, "")
out, err := parseActionArguments(values, a1, nil)
assert.Equal(t, "", out)
assert.NotNil(t, err)
@ -247,7 +246,7 @@ func TestMangleInvalidArgumentValues(t *testing.T) {
cfg.Sanitize()
req := ExecutionRequest{
Action: a1,
// Action: a1,
AuthenticatedUser: acl.UserFromSystem(cfg, "testuser"),
Cfg: cfg,
Arguments: map[string]string{

11
service/internal/httpservers/restapi.go
View File

@ -9,7 +9,7 @@ import (
"net/http"
"strings"
// apiv1 "github.com/OliveTin/OliveTin/gen/olivetin/api/v1"
// apiv1 "github.com/OliveTin/OliveTin/gen/olivetin/api/v1"
config "github.com/OliveTin/OliveTin/internal/config"
)
@ -62,10 +62,10 @@ func parseRequestMetadata(cfg *config.Config, ctx context.Context, req *http.Req
provider = "http-header"
}
// if len(cfg.AuthOAuth2Providers) > 0 && username == "" {
// username, usergroup, sid = parseOAuth2Cookie(req)
// provider = "oauth2"
// }
// if len(cfg.AuthOAuth2Providers) > 0 && username == "" {
// username, usergroup, sid = parseOAuth2Cookie(req)
// provider = "oauth2"
// }
if cfg.AuthLocalUsers.Enabled && username == "" {
username, usergroup, sid = parseLocalUserCookie(cfg, req)
@ -147,4 +147,3 @@ func getMetadataKeyOrEmpty(md metadata.MD, key string) string {
return ""
}

12
service/internal/httpservers/restapi_auth_jwt_test.go
View File

@ -6,13 +6,13 @@ import (
"crypto/x509"
"encoding/pem"
"fmt"
config "github.com/OliveTin/OliveTin/internal/config"
"github.com/golang-jwt/jwt/v4"
// "github.com/stretchr/testify/assert"
// config "github.com/OliveTin/OliveTin/internal/config"
// "github.com/golang-jwt/jwt/v4"
// "github.com/stretchr/testify/assert"
"net/http"
"os"
"testing"
"time"
// "time"
)
func createKeys(t *testing.T) (*rsa.PrivateKey, string) {
@ -45,6 +45,7 @@ func newMux() *http.ServeMux {
}
func testJwkValidation(t *testing.T, expire int64, expectCode int) {
/*
privateKey, publicKeyPath := createKeys(t)
defer os.Remove(publicKeyPath)
@ -62,6 +63,7 @@ func testJwkValidation(t *testing.T, expire int64, expectCode int) {
claims["exp"] = time.Now().Unix() + expire
claims["sub"] = "test"
claims["olivetinGroup"] = "test"
*/
/*
tokenStr, _ := token.SignedString(privateKey)
@ -114,6 +116,7 @@ func TestJWTSignatureVerificationFails(t *testing.T) {
}
func TestJWTHeader(t *testing.T) {
/*
privateKey, publicKeyPath := createKeys(t)
defer os.Remove(publicKeyPath)
@ -131,6 +134,7 @@ func TestJWTHeader(t *testing.T) {
claims["exp"] = time.Now().Unix() + 2000
claims["sub"] = "test"
claims["olivetinGroup"] = []string{"test", "test2"}
*/
/*
tokenStr, _ := token.SignedString(privateKey)

2
service/internal/httpservers/restapi_auth_local.go
View File

@ -1,8 +1,8 @@
package httpservers
import (
"google.golang.org/grpc/metadata"
"github.com/OliveTin/OliveTin/internal/config"
"google.golang.org/grpc/metadata"
"net/http"
"github.com/google/uuid"

5
service/internal/httpservers/restapi_test.go
View File

@ -1,6 +1,3 @@
package httpservers
import (
)
import ()

2
service/internal/httpservers/webuiServer.go
View File

@ -37,7 +37,7 @@ func NewWebUIServer(cfg *config.Config) *webUIServer {
}
func (s *webUIServer) handleWebui(w http.ResponseWriter, r *http.Request) {
//dirName := path.Dir(r.URL.Path)
// dirName := path.Dir(r.URL.Path)
// Mangle requests for any path like /logs or /config to load the webui index.html
if path.Ext(r.URL.Path) == "" && r.URL.Path != "/" {

4
service/internal/httpservers/webuiServer_test.go
View File

@ -1,5 +1,3 @@
package httpservers
import (
)
import ()

2
service/internal/oncalendarfile/calendar.go
View File

@ -102,7 +102,7 @@ func exec(instant time.Time, action *config.Action, cfg *config.Config, ex *exec
}).Infof("Executing action from calendar")
req := &executor.ExecutionRequest{
Action: action,
Binding: ex.FindBindingWithNoEntity(action),
Cfg: cfg,
Tags: []string{},
AuthenticatedUser: acl.UserFromSystem(cfg, "calendar"),

2
service/internal/oncron/cron.go
View File

@ -34,7 +34,7 @@ func scheduleAction(cfg *config.Config, scheduler *cron.Cron, cronline string, e
_, err := scheduler.AddFunc(cronline, func() {
req := &executor.ExecutionRequest{
ActionTitle: action.Title,
Binding: ex.FindBindingWithNoEntity(action),
Cfg: cfg,
Tags: []string{},
AuthenticatedUser: acl.UserFromSystem(cfg, "cron"),

2
service/internal/onfileindir/fileindir.go
View File

@ -50,7 +50,7 @@ func scheduleExec(action *config.Action, cfg *config.Config, ex *executor.Execut
fmt.Printf("%+v", args)
req := &executor.ExecutionRequest{
ActionTitle: action.Title,
Binding: ex.FindBindingWithNoEntity(action),
Cfg: cfg,
Tags: []string{},
Arguments: args,

2
service/internal/onstartup/startup.go
View File

@ -17,7 +17,7 @@ func Execute(cfg *config.Config, ex *executor.Executor) {
}).Infof("Startup action")
req := &executor.ExecutionRequest{
ActionTitle: action.Title,
Binding: ex.FindBindingWithNoEntity(action),
Arguments: nil,
Cfg: cfg,
Tags: []string{},