Закрытие уязвимости с именами тестов
v++
This commit is contained in:
10
.idea/workspace.xml
generated
10
.idea/workspace.xml
generated
@@ -6,7 +6,15 @@
|
|||||||
</artifacts-to-build>
|
</artifacts-to-build>
|
||||||
</component>
|
</component>
|
||||||
<component name="ChangeListManager">
|
<component name="ChangeListManager">
|
||||||
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="" />
|
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
|
||||||
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/ComponentsServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/ComponentsServer.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestFromDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestFromDirectory.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestFromProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestFromProject.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestsGroupFromSelectedVersions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestsGroupFromSelectedVersions.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/TestDialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/TestDialog.java" afterDir="false" />
|
||||||
|
</list>
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
<option name="SHOW_DIALOG" value="false" />
|
||||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||||
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
"Name": "M",
|
"Name": "M",
|
||||||
"ServerUserPassword": "mprit_2011",
|
"ServerUserPassword": "mprit_2011",
|
||||||
"Workspace": "E:\\Tests",
|
"Workspace": "E:\\Tests",
|
||||||
"ProjectsSearchDirectory": "E:\\Tests\\Downloads\\236",
|
"ProjectsSearchDirectory": "E:\\Tests\\Downloads",
|
||||||
"VisualiserPath": "C:\\Users\\misha\\Downloads",
|
"VisualiserPath": "C:\\Users\\misha\\Downloads",
|
||||||
"Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F",
|
"Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F",
|
||||||
"Visualizer_2Path": "C:\\Users\\misha\\Documents",
|
"Visualizer_2Path": "C:\\Users\\misha\\Documents",
|
||||||
|
|||||||
@@ -377,7 +377,7 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
|
|||||||
GetComponentsBackUps();
|
GetComponentsBackUps();
|
||||||
break;
|
break;
|
||||||
case UpdateComponent:
|
case UpdateComponent:
|
||||||
//возможно со стороны админа ввод подтверждения по почте запрашивать.
|
//zip
|
||||||
PublishComponent();
|
PublishComponent();
|
||||||
break;
|
break;
|
||||||
case ReceiveComponent:
|
case ReceiveComponent:
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ import Common.Utils.Vector_;
|
|||||||
|
|
||||||
import java.util.Vector;
|
import java.util.Vector;
|
||||||
public class Constants {
|
public class Constants {
|
||||||
public static final int version = 1184;
|
public static final int version = 1185;
|
||||||
public static final int planner_version = 10;
|
public static final int planner_version = 10;
|
||||||
public static final int testingMaxKernels = 64; //вообще говоря, это параметр машины.
|
public static final int testingMaxKernels = 64; //вообще говоря, это параметр машины.
|
||||||
//--
|
//--
|
||||||
|
|||||||
@@ -197,13 +197,7 @@ public class CreateTestFromDirectory extends Pass<Test> {
|
|||||||
@Override
|
@Override
|
||||||
protected void body() throws Exception {
|
protected void body() throws Exception {
|
||||||
ShowMessage1(dir.getName());
|
ShowMessage1(dir.getName());
|
||||||
//--
|
|
||||||
File tempProject = packTestCode(); //создание копии папки, и архивация.
|
File tempProject = packTestCode(); //создание копии папки, и архивация.
|
||||||
//-- получить размерность консольным сапфором. папка уже отправлена и чистить ее не нужно!!
|
|
||||||
ShowMessage2("Синтаксический анализ и определение размерности");
|
|
||||||
if (group.language == LanguageName.fortran) {//если не определит, будут нули.
|
|
||||||
Sapfor.getMinMaxDim(Sapfor.getTempCopy(Global.mainModule.getSapfor().getFile()), tempProject, target);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
protected boolean validate() {
|
protected boolean validate() {
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import _VisualDVM.Global;
|
|||||||
import _VisualDVM.ProjectData.Files.FileState;
|
import _VisualDVM.ProjectData.Files.FileState;
|
||||||
import _VisualDVM.ProjectData.Files.ProjectFile;
|
import _VisualDVM.ProjectData.Files.ProjectFile;
|
||||||
import _VisualDVM.ProjectData.Project.db_project_info;
|
import _VisualDVM.ProjectData.Project.db_project_info;
|
||||||
|
import _VisualDVM.TestingSystem.Common.Group.Group;
|
||||||
//добавить в текущую группу новый тест из текущего проекта.
|
//добавить в текущую группу новый тест из текущего проекта.
|
||||||
public class CreateTestFromProject extends CreateTestFromDirectory {
|
public class CreateTestFromProject extends CreateTestFromDirectory {
|
||||||
db_project_info project;
|
db_project_info project;
|
||||||
@@ -13,15 +14,27 @@ public class CreateTestFromProject extends CreateTestFromDirectory {
|
|||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
protected boolean canStart(Object... args) throws Exception {
|
protected boolean canStart(Object... args) throws Exception {
|
||||||
if (Global.testingServer.db.groups.getUI().canModifyCurrent(Log) && Global.mainModule.Check(Log, Current.Project)) {
|
if (args.length == 0) {
|
||||||
project = Global.mainModule.getProject();
|
if (Global.testingServer.db.groups.getUI().canModifyCurrent(Log) && Global.mainModule.Check(Log, Current.Project)) {
|
||||||
if (super.canStart(
|
project = Global.mainModule.getProject();
|
||||||
project.Home,
|
if (super.canStart(
|
||||||
Global.testingServer.db.groups.getUI().getCurrent())) {
|
project.Home,
|
||||||
from_files_chooser = true; //чтобы опубликовал.
|
Global.testingServer.db.groups.getUI().getCurrent())) {
|
||||||
return true;
|
from_files_chooser = true; //чтобы опубликовал.
|
||||||
|
return true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else {
|
||||||
|
project = (db_project_info) args[0];
|
||||||
|
group = (Group) args[1];
|
||||||
|
//если проект не текущий, освежить его бд.
|
||||||
|
if (!Global.mainModule.HasProject() || !Global.mainModule.getProject().Home.equals(project.Home)) {
|
||||||
|
project.Open();
|
||||||
|
project.Close();
|
||||||
|
}
|
||||||
|
return super.canStart(project.Home, group);
|
||||||
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ public class CreateTestsGroupFromSelectedVersions extends PublishTests {
|
|||||||
protected boolean canStart(Object... args) throws Exception {
|
protected boolean canStart(Object... args) throws Exception {
|
||||||
target = new Vector<>();
|
target = new Vector<>();
|
||||||
//---
|
//---
|
||||||
if (Global.testingServer.db.groups.getUI().CheckCurrent(Log)) {
|
if (Global.testingServer.db.groups.getUI().canModifyCurrent(Log)) {
|
||||||
group = Global.testingServer.db.groups.getUI().getCurrent();
|
group = Global.testingServer.db.groups.getUI().getCurrent();
|
||||||
} else
|
} else
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
@@ -1,8 +1,10 @@
|
|||||||
package _VisualDVM.TestingSystem.Common.Test.UI;
|
package _VisualDVM.TestingSystem.Common.Test.UI;
|
||||||
|
import Common.Utils.Utils_;
|
||||||
import Common.Visual.Windows.Dialog.DBObjectDialog;
|
import Common.Visual.Windows.Dialog.DBObjectDialog;
|
||||||
import _VisualDVM.Global;
|
import _VisualDVM.Global;
|
||||||
import _VisualDVM.TestingSystem.Common.Group.Group;
|
import _VisualDVM.TestingSystem.Common.Group.Group;
|
||||||
import _VisualDVM.TestingSystem.Common.Test.Test;
|
import _VisualDVM.TestingSystem.Common.Test.Test;
|
||||||
|
import _VisualDVM.Utils;
|
||||||
public class TestDialog extends DBObjectDialog<Test, TestFields> {
|
public class TestDialog extends DBObjectDialog<Test, TestFields> {
|
||||||
public TestDialog() {
|
public TestDialog() {
|
||||||
super(TestFields.class);
|
super(TestFields.class);
|
||||||
@@ -23,6 +25,7 @@ public class TestDialog extends DBObjectDialog<Test, TestFields> {
|
|||||||
+
|
+
|
||||||
Global.testingServer.db.getTable(Group.class).getUI().getCurrent().language);
|
Global.testingServer.db.getTable(Group.class).getUI().getCurrent().language);
|
||||||
}
|
}
|
||||||
|
Utils.validateFileShortNewName(fields.tfName.getText(),Log);
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
public void fillFields() {
|
public void fillFields() {
|
||||||
|
|||||||
Reference in New Issue
Block a user