individual configurations per user

graph/model/models.go

@@ -7,3 +7,20 @@ type JobTag struct {
 	TagType string `json:"tagType" db:"tag_type"`
 	TagName string `json:"tagName" db:"tag_name"`
 }
+
+type Cluster struct {
+	ClusterID            string          `json:"clusterID"`
+	ProcessorType        string          `json:"processorType"`
+	SocketsPerNode       int             `json:"socketsPerNode"`
+	CoresPerSocket       int             `json:"coresPerSocket"`
+	ThreadsPerCore       int             `json:"threadsPerCore"`
+	FlopRateScalar       int             `json:"flopRateScalar"`
+	FlopRateSimd         int             `json:"flopRateSimd"`
+	MemoryBandwidth      int             `json:"memoryBandwidth"`
+	MetricConfig         []*MetricConfig `json:"metricConfig"`
+	FilterRanges         *FilterRanges   `json:"filterRanges"`
+	MetricDataRepository *struct {
+		Kind string `json:"kind"`
+		Url  string `json:"url"`
+	} `json:"metricDataRepository"`
+}

graph/model/models_gen.go

@@ -11,19 +11,6 @@ import (
 	"github.com/ClusterCockpit/cc-jobarchive/schema"
 )
 
-type Cluster struct {
-	ClusterID       string          `json:"clusterID"`
-	ProcessorType   string          `json:"processorType"`
-	SocketsPerNode  int             `json:"socketsPerNode"`
-	CoresPerSocket  int             `json:"coresPerSocket"`
-	ThreadsPerCore  int             `json:"threadsPerCore"`
-	FlopRateScalar  int             `json:"flopRateScalar"`
-	FlopRateSimd    int             `json:"flopRateSimd"`
-	MemoryBandwidth int             `json:"memoryBandwidth"`
-	MetricConfig    []*MetricConfig `json:"metricConfig"`
-	FilterRanges    *FilterRanges   `json:"filterRanges"`
-}
-
 type FilterRanges struct {
 	Duration  *IntRangeOutput  `json:"duration"`
 	NumNodes  *IntRangeOutput  `json:"numNodes"`

graph/resolver.go

@@ -1,11 +1,14 @@
 package graph
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"regexp"
 	"strings"
+	"time"
 
+	"github.com/ClusterCockpit/cc-jobarchive/auth"
 	"github.com/ClusterCockpit/cc-jobarchive/graph/model"
 	sq "github.com/Masterminds/squirrel"
 	"github.com/jmoiron/sqlx"
@@ -37,13 +40,18 @@ func ScanJob(row Scannable) (*model.Job, error) {
 		return nil, err
 	}
 
+	if job.Duration == 0 && job.State == model.JobStateRunning {
+		job.Duration = int(time.Since(job.StartTime).Seconds())
+	}
+
 	job.Nodes = strings.Split(nodeList, ",")
 	return job, nil
 }
 
 // Helper function for the `jobs` GraphQL-Query. Is also used elsewhere when a list of jobs is needed.
-func (r *Resolver) queryJobs(filters []*model.JobFilter, page *model.PageRequest, order *model.OrderByInput) ([]*model.Job, int, error) {
+func (r *Resolver) queryJobs(ctx context.Context, filters []*model.JobFilter, page *model.PageRequest, order *model.OrderByInput) ([]*model.Job, int, error) {
 	query := sq.Select(JobTableCols...).From("job")
+	query = securityCheck(ctx, query)
 
 	if order != nil {
 		field := toSnakeCase(order.Field)
@@ -100,6 +108,20 @@ func (r *Resolver) queryJobs(filters []*model.JobFilter, page *model.PageRequest
 	return jobs, count, nil
 }
 
+func securityCheck(ctx context.Context, query sq.SelectBuilder) sq.SelectBuilder {
+	val := ctx.Value(auth.ContextUserKey)
+	if val == nil {
+		return query
+	}
+
+	user := val.(*auth.User)
+	if user.IsAdmin {
+		return query
+	}
+
+	return query.Where("job.user_id = ?", user.Username)
+}
+
 // Build a sq.SelectBuilder out of a model.JobFilter.
 func buildWhereClause(filter *model.JobFilter, query sq.SelectBuilder) sq.SelectBuilder {
 	if filter.Tags != nil {

graph/schema.resolvers.go

@@ -151,7 +151,9 @@ func (r *queryResolver) Tags(ctx context.Context) ([]*model.JobTag, error) {
 }
 
 func (r *queryResolver) Job(ctx context.Context, id string) (*model.Job, error) {
-	return ScanJob(sq.Select(JobTableCols...).From("job").Where("job.id = ?", id).RunWith(r.DB).QueryRow())
+	query := sq.Select(JobTableCols...).From("job").Where("job.id = ?", id)
+	query = securityCheck(ctx, query)
+	return ScanJob(query.RunWith(r.DB).QueryRow())
 }
 
 func (r *queryResolver) JobMetrics(ctx context.Context, id string, metrics []string) ([]*model.JobMetricWithName, error) {
@@ -181,7 +183,7 @@ func (r *queryResolver) JobsFootprints(ctx context.Context, filter []*model.JobF
 }
 
 func (r *queryResolver) Jobs(ctx context.Context, filter []*model.JobFilter, page *model.PageRequest, order *model.OrderByInput) (*model.JobResultList, error) {
-	jobs, count, err := r.queryJobs(filter, page, order)
+	jobs, count, err := r.queryJobs(ctx, filter, page, order)
 	if err != nil {
 		return nil, err
 	}

graph/stats.go

@@ -47,6 +47,7 @@ func (r *queryResolver) jobsStatistics(ctx context.Context, filter []*model.JobF
 			).From("job").Where("job.cluster_id = ?", cluster.ClusterID).GroupBy(col)
 		}
 
+		query = securityCheck(ctx, query)
 		for _, f := range filter {
 			query = buildWhereClause(f, query)
 		}
@@ -82,6 +83,7 @@ func (r *queryResolver) jobsStatistics(ctx context.Context, filter []*model.JobF
 
 	if groupBy == nil {
 		query := sq.Select("COUNT(job.id)").From("job").Where("job.duration < 120")
+		query = securityCheck(ctx, query)
 		for _, f := range filter {
 			query = buildWhereClause(f, query)
 		}
@@ -91,6 +93,7 @@ func (r *queryResolver) jobsStatistics(ctx context.Context, filter []*model.JobF
 	} else {
 		col := groupBy2column[*groupBy]
 		query := sq.Select(col, "COUNT(job.id)").From("job").Where("job.duration < 120")
+		query = securityCheck(ctx, query)
 		for _, f := range filter {
 			query = buildWhereClause(f, query)
 		}
@@ -133,12 +136,12 @@ func (r *queryResolver) jobsStatistics(ctx context.Context, filter []*model.JobF
 
 		if histogramsNeeded {
 			var err error
-			stat.HistWalltime, err = r.jobsStatisticsHistogram("ROUND(job.duration / 3600) as value", filter, id, col)
+			stat.HistWalltime, err = r.jobsStatisticsHistogram(ctx, "ROUND(job.duration / 3600) as value", filter, id, col)
 			if err != nil {
 				return nil, err
 			}
 
-			stat.HistNumNodes, err = r.jobsStatisticsHistogram("job.num_nodes as value", filter, id, col)
+			stat.HistNumNodes, err = r.jobsStatisticsHistogram(ctx, "job.num_nodes as value", filter, id, col)
 			if err != nil {
 				return nil, err
 			}
@@ -150,8 +153,9 @@ func (r *queryResolver) jobsStatistics(ctx context.Context, filter []*model.JobF
 
 // `value` must be the column grouped by, but renamed to "value". `id` and `col` can optionally be used
 // to add a condition to the query of the kind "<col> = <id>".
-func (r *queryResolver) jobsStatisticsHistogram(value string, filters []*model.JobFilter, id, col string) ([]*model.HistoPoint, error) {
+func (r *queryResolver) jobsStatisticsHistogram(ctx context.Context, value string, filters []*model.JobFilter, id, col string) ([]*model.HistoPoint, error) {
 	query := sq.Select(value, "COUNT(job.id) AS count").From("job")
+	query = securityCheck(ctx, query)
 	for _, f := range filters {
 		query = buildWhereClause(f, query)
 	}
@@ -179,7 +183,7 @@ func (r *queryResolver) jobsStatisticsHistogram(value string, filters []*model.J
 
 // Helper function for the rooflineHeatmap GraphQL query placed here so that schema.resolvers.go is not too full.
 func (r *Resolver) rooflineHeatmap(ctx context.Context, filter []*model.JobFilter, rows int, cols int, minX float64, minY float64, maxX float64, maxY float64) ([][]float64, error) {
-	jobs, count, err := r.queryJobs(filter, &model.PageRequest{Page: 1, ItemsPerPage: 501}, nil)
+	jobs, count, err := r.queryJobs(ctx, filter, &model.PageRequest{Page: 1, ItemsPerPage: 501}, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -232,7 +236,7 @@ func (r *Resolver) rooflineHeatmap(ctx context.Context, filter []*model.JobFilte
 
 // Helper function for the jobsFootprints GraphQL query placed here so that schema.resolvers.go is not too full.
 func (r *queryResolver) jobsFootprints(ctx context.Context, filter []*model.JobFilter, metrics []string) ([]*model.MetricFootprints, error) {
-	jobs, count, err := r.queryJobs(filter, &model.PageRequest{Page: 1, ItemsPerPage: 501}, nil)
+	jobs, count, err := r.queryJobs(ctx, filter, &model.PageRequest{Page: 1, ItemsPerPage: 501}, nil)
 	if err != nil {
 		return nil, err
 	}