grahamc/hydra - Change HQGXL4MXGHICQ3IRRQUR6KQHS2RKVOTDKQ5ZETXHQ56DANR2YADQC

Add validation for project and jobset names

Created by Eelco Dolstra on April 17, 2012

HQGXL4MXGHICQ3IRRQUR6KQHS2RKVOTDKQ5ZETXHQ56DANR2YADQC

Dependencies

In channels

main

upstream

Change contents

Replacement in src/lib/Hydra/Controller/Jobset.pm at line 224 [5.104]

B:BD[4.1571] → [4.1571:1667]

    error($c, "Invalid jobset name: $jobsetName") unless $jobsetName =~ /^[[:alpha:]][\w\-]*$/;

[4.1571]

[4.1667]

    error($c, "Invalid jobset name: ‘$jobsetName’") if $jobsetName !~ /^$jobsetNameRE$/;

Replacement in src/lib/Hydra/Controller/Jobset.pm at line 301 [5.104]

B:BD[6.427] → [6.427:594]

    my $newjobsetName = trim $c->request->params->{"newjobset"};
    error($c, "Invalid jobset name: $newjobsetName") unless $newjobsetName =~ /^[[:alpha:]][\w\-]*$/;

[6.427]

[6.594]

    my $newJobsetName = trim $c->request->params->{"newjobset"};
    error($c, "Invalid jobset name: $newJobsetName") unless $newJobsetName =~ /^[[:alpha:]][\w\-]*$/;

Replacement in src/lib/Hydra/Controller/Jobset.pm at line 304 [5.104]
B:BD[6.595] → [7.188:207]
```
    my $newjobset;
```
[6.595]
[7.207]
```
    my $newJobset;
```

Replacement in src/lib/Hydra/Controller/Jobset.pm at line 306 [5.104]

∅:D[7.249] → [6.664:757]

B:BD[6.664] → [6.664:757]

        $newjobset = $jobset->project->jobsets->create(
            { name => $newjobsetName

[7.249]

[6.757]

        $newJobset = $jobset->project->jobsets->create(
            { name => $newJobsetName

Replacement in src/lib/Hydra/Controller/Jobset.pm at line 317 [5.104]

B:BD[6.1118] → [6.1118:1225]

            my $newinput = $newjobset->jobsetinputs->create({name => $input->name, type => $input->type});

[6.1118]

[6.1225]

            my $newinput = $newJobset->jobsetinputs->create({name => $input->name, type => $input->type});

Replacement in src/lib/Hydra/Controller/Jobset.pm at line 324 [5.104]

∅:D[7.378] → [6.1431:1555]

B:BD[6.1431] → [6.1431:1555]

    $c->res->redirect($c->uri_for($c->controller('Jobset')->action_for("edit"), [$jobset->project->name, $newjobsetName]));

[7.378]

[3.53]

    $c->res->redirect($c->uri_for($c->controller('Jobset')->action_for("edit"), [$jobset->project->name, $newJobsetName]));

Replacement in src/lib/Hydra/Controller/JobsetEval.pm at line 35 [9.1302]

B:BD[8.401] → [8.401:781]

B:BD[8.781] → [2.112:160]

    if (defined $compare && $compare =~ /^\d+$/) {
        $eval2 = $c->model('DB::JobsetEvals')->find($compare)
            or notFound($c, "Evaluation $compare doesn't exist.");
    } elsif (defined $compare && $compare =~ /^($jobNameRE)$/) {
        my $j = $c->stash->{project}->jobsets->find({name => $compare})
            or notFound($c, "Jobset $compare doesn't exist.");
        $eval2 = getLatestFinishedEval($c, $j);

[8.401]

[8.1069]

    if (defined $compare) {
        if ($compare =~ /^\d+$/) {
            $eval2 = $c->model('DB::JobsetEvals')->find($compare)
                or notFound($c, "Evaluation $compare doesn't exist.");
        } elsif (defined $compare && $compare =~ /^($jobsetNameRE)$/) {
            my $j = $c->stash->{project}->jobsets->find({name => $compare})
                or notFound($c, "Jobset $compare doesn't exist.");
            $eval2 = getLatestFinishedEval($c, $j);
        } else {
            notFound($c, "Unknown comparison source ‘$compare’.");
        }

Insertion in src/lib/Hydra/Controller/Project.pm at line 122 [10.1245]

[10.3258]

[11.301]

    error($c, "Invalid project name: ‘$projectName’") if $projectName !~ /^$projectNameRE$/;

Insertion in src/lib/Hydra/Controller/Project.pm at line 156 [10.1245]

[4.5257]


    error($c, "Invalid jobset name: ‘$jobsetName’") if $jobsetName !~ /^$jobsetNameRE$/;

Replacement in src/lib/Hydra/Controller/Project.pm at line 175 [10.1245]

B:BD[10.3853] → [12.0:117]

    error($c, "Invalid project name: " . ($projectName || "(empty)")) unless $projectName =~ /^[[:alpha:]][\w\-]*$/;

[10.3853]

[10.3966]

    error($c, "Invalid project name: ‘$projectName’") if $projectName !~ /^$projectNameRE$/;

Replacement in src/lib/Hydra/Helper/CatalystUtils.pm at line 16 [14.3469]

∅:D[2.187] → [13.689:748]

B:BD[10.9780] → [13.689:748]

    $pathCompRE $relPathRE $relNameRE $jobNameRE $systemRE

[2.187]

[15.547]

    $pathCompRE $relPathRE $relNameRE $projectNameRE $jobsetNameRE $jobNameRE $systemRE

Replacement in src/lib/Hydra/Helper/CatalystUtils.pm at line 184 [14.3469]

B:BD[16.218] → [15.1035:1414]

Readonly our $pathCompRE => "(?:[A-Za-z0-9-\+\._][A-Za-z0-9-\+\._]*)";
Readonly our $relPathRE  => "(?:$pathCompRE(?:/$pathCompRE)*)";
Readonly our $relNameRE  => "(?:[A-Za-z0-9-][A-Za-z0-9-\.]*)";
Readonly our $attrNameRE => "(?:[A-Za-z_][A-Za-z0-9_]*)";
Readonly our $jobNameRE  => "(?:$attrNameRE(?:\\.$attrNameRE)*)";
Readonly our $systemRE   => "(?:[a-z0-9_]+-[a-z0-9_]+)";

[16.218]

[16.367]

Readonly our $pathCompRE    => "(?:[A-Za-z0-9-\+\._][A-Za-z0-9-\+\._]*)";
Readonly our $relPathRE     => "(?:$pathCompRE(?:/$pathCompRE)*)";
Readonly our $relNameRE     => "(?:[A-Za-z0-9-][A-Za-z0-9-\.]*)";
Readonly our $attrNameRE    => "(?:[A-Za-z_][A-Za-z0-9_]*)";
Readonly our $projectNameRE => "(?:[A-Za-z_][A-Za-z0-9-_]*)";
Readonly our $jobsetNameRE  => "(?:[A-Za-z_][A-Za-z0-9-_]*)";
Readonly our $jobNameRE     => "(?:$attrNameRE(?:\\.$attrNameRE)*)";
Readonly our $systemRE      => "(?:[a-z0-9_]+-[a-z0-9_]+)";