Skip to content

The Unified and Autonomous Development Platform

Add submodule support for ci

robin shen22a2d39525b5
diff --git a/server-core/pom.xml b/server-core/pom.xml
index 4e9c105e18..1c80080316 100644
--- a/server-core/pom.xml
+++ b/server-core/pom.xml
@@ -1,408 +1,413 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <artifactId>server-core</artifactId>
- <parent>
- <groupId>io.onedev</groupId>
- <artifactId>server</artifactId>
- <version>3.0.1</version>
- </parent>
- <build>
- <plugins>
- <plugin>
- <groupId>org.antlr</groupId>
- <artifactId>antlr4-maven-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>io.onedev</groupId>
- <artifactId>commons-launcher-loader</artifactId>
- </dependency>
- <dependency>
- <groupId>io.onedev</groupId>
- <artifactId>commons-launcher-loader</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>io.onedev</groupId>
- <artifactId>commons-codeassist</artifactId>
- </dependency>
- <dependency>
- <groupId>io.onedev</groupId>
- <artifactId>commons-jsymbol</artifactId>
- </dependency>
- <dependency>
- <groupId>io.onedev</groupId>
- <artifactId>commons-jsyntax</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.7</version>
- </dependency>
- <dependency>
- <groupId>org.jetbrains.xodus</groupId>
- <artifactId>xodus-entity-store</artifactId>
- <version>1.2.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tika</groupId>
- <artifactId>tika-core</artifactId>
- <version>1.20</version>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>20.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-email</artifactId>
- <version>1.4</version>
- </dependency>
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
- <version>1.7</version>
- </dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.1</version>
- </dependency>
- <dependency>
- <groupId>joda-time</groupId>
- <artifactId>joda-time</artifactId>
- <version>2.2</version>
- </dependency>
- <dependency>
- <groupId>org.javassist</groupId>
- <artifactId>javassist</artifactId>
- <version>3.20.0-GA</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlets</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.yaml</groupId>
- <artifactId>snakeyaml</artifactId>
- <version>1.21</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlet</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty.websocket</groupId>
- <artifactId>websocket-server</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.containers</groupId>
- <artifactId>jersey-container-servlet</artifactId>
- <version>${jersey.version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.ext</groupId>
- <artifactId>jersey-bean-validation</artifactId>
- <version>${jersey.version}</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-validator</artifactId>
- <version>5.2.4.Final</version>
- </dependency>
- <dependency>
- <groupId>org.unbescape</groupId>
- <artifactId>unbescape</artifactId>
- <version>1.1.2.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-core</artifactId>
- <version>${wicket.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-extensions</artifactId>
- <version>${wicket.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-request</artifactId>
- <version>${wicket.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-util</artifactId>
- <version>${wicket.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-devutils</artifactId>
- <version>${wicket.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-native-websocket-core</artifactId>
- <version>${wicket.version}</version>
- </dependency>
- <dependency>
- <groupId>org.webjars</groupId>
- <artifactId>font-awesome</artifactId>
- <version>4.7.0</version>
- <exclusions>
- <exclusion>
- <groupId>org.webjars</groupId>
- <artifactId>bootstrap</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>de.agilecoders.wicket</groupId>
- <artifactId>wicket-bootstrap-core</artifactId>
- <version>${wicketbootstrap.version}</version>
- </dependency>
- <dependency>
- <groupId>de.agilecoders.wicket</groupId>
- <artifactId>wicket-bootstrap-extensions</artifactId>
- <version>${wicketbootstrap.version}</version>
- </dependency>
- <dependency>
- <groupId>org.webjars.npm</groupId>
- <artifactId>codemirror</artifactId>
- <version>5.21.0</version>
- </dependency>
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <version>1.3.3</version>
- </dependency>
- <dependency>
- <groupId>commons-validator</groupId>
- <artifactId>commons-validator</artifactId>
- <version>1.4.0</version>
- </dependency>
- <dependency>
- <groupId>org.ocpsoft.prettytime</groupId>
- <artifactId>prettytime</artifactId>
- <version>4.0.1.Final</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>4.5.6</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.hk2</groupId>
- <artifactId>guice-bridge</artifactId>
- <version>2.5.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.shiro</groupId>
- <artifactId>shiro-core</artifactId>
- <version>${shiro.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <artifactId>lucene-core</artifactId>
- <groupId>org.apache.lucene</groupId>
- <version>${lucene.version}</version>
- </dependency>
- <dependency>
- <artifactId>lucene-queries</artifactId>
- <groupId>org.apache.lucene</groupId>
- <version>${lucene.version}</version>
- </dependency>
- <dependency>
- <artifactId>lucene-analyzers-common</artifactId>
- <groupId>org.apache.lucene</groupId>
- <version>${lucene.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.shiro</groupId>
- <artifactId>shiro-web</artifactId>
- <version>${shiro.version}</version>
- </dependency>
- <dependency>
- <groupId>com.pmease.security.shiro</groupId>
- <artifactId>shiro-bcrypt</artifactId>
- <version>1.0.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.shiro</groupId>
- <artifactId>shiro-guice</artifactId>
- <version>${shiro.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${hibernate.version}</version>
- <exclusions>
- <exclusion>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-ehcache</artifactId>
- <version>${hibernate.version}</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-entitymanager</artifactId>
- <version>${hibernate.version}</version>
- <exclusions>
- <exclusion>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-hikaricp</artifactId>
- <version>${hibernate.version}</version>
- </dependency>
- <dependency>
- <groupId>com.zaxxer</groupId>
- <artifactId>HikariCP</artifactId>
- <version>2.7.9</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish</groupId>
- <artifactId>javax.el</artifactId>
- <version>3.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>2.4.0</version>
- </dependency>
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- <version>1.4.197</version>
- </dependency>
- <dependency>
- <groupId>org.dom4j</groupId>
- <artifactId>dom4j</artifactId>
- <version>2.1.1</version>
- </dependency>
- <dependency>
- <groupId>jaxen</groupId>
- <artifactId>jaxen</artifactId>
- <version>1.1.6</version>
- </dependency>
- <dependency>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- <version>1.4.9</version>
- </dependency>
- <dependency>
- <groupId>com.joestelmach</groupId>
- <artifactId>natty</artifactId>
- <version>0.13</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy</artifactId>
- <version>${groovy.version}</version>
- </dependency>
- <dependency>
- <groupId>com.googlecode.juniversalchardet</groupId>
- <artifactId>juniversalchardet</artifactId>
- <version>1.0.3</version>
- </dependency>
- <dependency>
- <groupId>com.vladsch.flexmark</groupId>
- <artifactId>flexmark</artifactId>
- <version>${flexmark.version}</version>
- </dependency>
- <dependency>
- <groupId>com.vladsch.flexmark</groupId>
- <artifactId>flexmark-ext-autolink</artifactId>
- <version>${flexmark.version}</version>
- </dependency>
- <dependency>
- <groupId>com.vladsch.flexmark</groupId>
- <artifactId>flexmark-ext-anchorlink</artifactId>
- <version>${flexmark.version}</version>
- </dependency>
- <dependency>
- <groupId>com.vladsch.flexmark</groupId>
- <artifactId>flexmark-ext-definition</artifactId>
- <version>${flexmark.version}</version>
- </dependency>
- <dependency>
- <groupId>com.vladsch.flexmark</groupId>
- <artifactId>flexmark-ext-tables</artifactId>
- <version>${flexmark.version}</version>
- </dependency>
- <dependency>
- <groupId>com.vladsch.flexmark</groupId>
- <artifactId>flexmark-ext-gfm-tasklist</artifactId>
- <version>${flexmark.version}</version>
- </dependency>
- <dependency>
- <groupId>com.vladsch.flexmark</groupId>
- <artifactId>flexmark-ext-toc</artifactId>
- <version>${flexmark.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jgit</groupId>
- <artifactId>org.eclipse.jgit.http.server</artifactId>
- <version>${jgit.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jgit</groupId>
- <artifactId>org.eclipse.jgit.archive</artifactId>
- <version>${jgit.version}</version>
- </dependency>
- <dependency>
- <groupId>io.onedev</groupId>
- <artifactId>k8s-helper</artifactId>
- <version>1.0.5</version>
- </dependency>
- </dependencies>
- <properties>
- <moduleClass>io.onedev.server.CoreModule</moduleClass>
- <lucene.version>7.1.0</lucene.version>
- <hibernate.version>5.2.10.Final</hibernate.version>
- <shiro.version>1.4.0</shiro.version>
- <jgit.version>5.1.3.201810200350-r</jgit.version>
- <flexmark.version>0.18.3</flexmark.version>
- <groovy.version>2.4.14</groovy.version>
- <wicket.version>7.10.0</wicket.version>
- <wicketbootstrap.version>0.10.17</wicketbootstrap.version>
- <jersey.version>2.26</jersey.version>
- <jetty.version>9.3.27.v20190418</jetty.version>
- <servlet.version>3.1.0</servlet.version>
- </properties>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>server-core</artifactId>
+ <parent>
+ <groupId>io.onedev</groupId>
+ <artifactId>server</artifactId>
+ <version>3.0.1</version>
+ </parent>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.antlr</groupId>
+ <artifactId>antlr4-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>io.onedev</groupId>
+ <artifactId>commons-launcher-loader</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.onedev</groupId>
+ <artifactId>commons-launcher-loader</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>io.onedev</groupId>
+ <artifactId>commons-codeassist</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.onedev</groupId>
+ <artifactId>commons-jsymbol</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.onedev</groupId>
+ <artifactId>commons-jsyntax</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jetbrains.xodus</groupId>
+ <artifactId>xodus-entity-store</artifactId>
+ <version>1.2.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-core</artifactId>
+ <version>1.20</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>20.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-email</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity</artifactId>
+ <version>1.7</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ <version>2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>3.20.0-GA</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlets</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.yaml</groupId>
+ <artifactId>snakeyaml</artifactId>
+ <version>1.21</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty.websocket</groupId>
+ <artifactId>websocket-server</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jersey.containers</groupId>
+ <artifactId>jersey-container-servlet</artifactId>
+ <version>${jersey.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jersey.ext</groupId>
+ <artifactId>jersey-bean-validation</artifactId>
+ <version>${jersey.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ <version>5.2.4.Final</version>
+ </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
+ <version>1.62</version>
+ </dependency>
+ <dependency>
+ <groupId>org.unbescape</groupId>
+ <artifactId>unbescape</artifactId>
+ <version>1.1.2.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-core</artifactId>
+ <version>${wicket.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-extensions</artifactId>
+ <version>${wicket.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-request</artifactId>
+ <version>${wicket.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-util</artifactId>
+ <version>${wicket.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-devutils</artifactId>
+ <version>${wicket.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-native-websocket-core</artifactId>
+ <version>${wicket.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.webjars</groupId>
+ <artifactId>font-awesome</artifactId>
+ <version>4.7.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.webjars</groupId>
+ <artifactId>bootstrap</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>de.agilecoders.wicket</groupId>
+ <artifactId>wicket-bootstrap-core</artifactId>
+ <version>${wicketbootstrap.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>de.agilecoders.wicket</groupId>
+ <artifactId>wicket-bootstrap-extensions</artifactId>
+ <version>${wicketbootstrap.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.webjars.npm</groupId>
+ <artifactId>codemirror</artifactId>
+ <version>5.21.0</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <version>1.3.3</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-validator</groupId>
+ <artifactId>commons-validator</artifactId>
+ <version>1.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ocpsoft.prettytime</groupId>
+ <artifactId>prettytime</artifactId>
+ <version>4.0.1.Final</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>4.5.6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.hk2</groupId>
+ <artifactId>guice-bridge</artifactId>
+ <version>2.5.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-core</artifactId>
+ <version>${shiro.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <artifactId>lucene-core</artifactId>
+ <groupId>org.apache.lucene</groupId>
+ <version>${lucene.version}</version>
+ </dependency>
+ <dependency>
+ <artifactId>lucene-queries</artifactId>
+ <groupId>org.apache.lucene</groupId>
+ <version>${lucene.version}</version>
+ </dependency>
+ <dependency>
+ <artifactId>lucene-analyzers-common</artifactId>
+ <groupId>org.apache.lucene</groupId>
+ <version>${lucene.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-web</artifactId>
+ <version>${shiro.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.pmease.security.shiro</groupId>
+ <artifactId>shiro-bcrypt</artifactId>
+ <version>1.0.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-guice</artifactId>
+ <version>${shiro.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>${hibernate.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-ehcache</artifactId>
+ <version>${hibernate.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-entitymanager</artifactId>
+ <version>${hibernate.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-hikaricp</artifactId>
+ <version>${hibernate.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.zaxxer</groupId>
+ <artifactId>HikariCP</artifactId>
+ <version>2.7.9</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish</groupId>
+ <artifactId>javax.el</artifactId>
+ <version>3.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>2.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <version>1.4.197</version>
+ </dependency>
+ <dependency>
+ <groupId>org.dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>2.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ <version>1.1.6</version>
+ </dependency>
+ <dependency>
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
+ <version>1.4.9</version>
+ </dependency>
+ <dependency>
+ <groupId>com.joestelmach</groupId>
+ <artifactId>natty</artifactId>
+ <version>0.13</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy</artifactId>
+ <version>${groovy.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.googlecode.juniversalchardet</groupId>
+ <artifactId>juniversalchardet</artifactId>
+ <version>1.0.3</version>
+ </dependency>
+ <dependency>
+ <groupId>com.vladsch.flexmark</groupId>
+ <artifactId>flexmark</artifactId>
+ <version>${flexmark.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.vladsch.flexmark</groupId>
+ <artifactId>flexmark-ext-autolink</artifactId>
+ <version>${flexmark.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.vladsch.flexmark</groupId>
+ <artifactId>flexmark-ext-anchorlink</artifactId>
+ <version>${flexmark.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.vladsch.flexmark</groupId>
+ <artifactId>flexmark-ext-definition</artifactId>
+ <version>${flexmark.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.vladsch.flexmark</groupId>
+ <artifactId>flexmark-ext-tables</artifactId>
+ <version>${flexmark.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.vladsch.flexmark</groupId>
+ <artifactId>flexmark-ext-gfm-tasklist</artifactId>
+ <version>${flexmark.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.vladsch.flexmark</groupId>
+ <artifactId>flexmark-ext-toc</artifactId>
+ <version>${flexmark.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jgit</groupId>
+ <artifactId>org.eclipse.jgit.http.server</artifactId>
+ <version>${jgit.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jgit</groupId>
+ <artifactId>org.eclipse.jgit.archive</artifactId>
+ <version>${jgit.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.onedev</groupId>
+ <artifactId>k8s-helper</artifactId>
+ <version>1.0.5</version>
+ </dependency>
+ </dependencies>
+ <properties>
+ <moduleClass>io.onedev.server.CoreModule</moduleClass>
+ <lucene.version>7.1.0</lucene.version>
+ <hibernate.version>5.2.10.Final</hibernate.version>
+ <shiro.version>1.4.0</shiro.version>
+ <jgit.version>5.1.3.201810200350-r</jgit.version>
+ <flexmark.version>0.18.3</flexmark.version>
+ <groovy.version>2.4.14</groovy.version>
+ <wicket.version>7.10.0</wicket.version>
+ <wicketbootstrap.version>0.10.17</wicketbootstrap.version>
+ <jersey.version>2.26</jersey.version>
+ <jetty.version>9.3.27.v20190418</jetty.version>
+ <servlet.version>3.1.0</servlet.version>
+ </properties>
</project>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/ci/job/DefaultJobManager.java b/server-core/src/main/java/io/onedev/server/ci/job/DefaultJobManager.java
index 0ac7b1acc3..ba664ba036 100644
--- a/server-core/src/main/java/io/onedev/server/ci/job/DefaultJobManager.java
+++ b/server-core/src/main/java/io/onedev/server/ci/job/DefaultJobManager.java
@@ -313,8 +313,18 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
List<String> commands = Splitter.on("\n").trimResults(CharMatcher.is('\r')).splitToList(job.getCommands());
+ List<SubmoduleCredential> submoduleCredentials = new ArrayList<>();
+ if (job.isRetrieveSource()) {
+ for (SubmoduleCredential submoduleCredential: job.getSubmoduleCredentials()) {
+ SubmoduleCredential resolvedSubmoduleCredential = new SubmoduleCredential();
+ resolvedSubmoduleCredential.setUrl(submoduleCredential.getUrl());
+ resolvedSubmoduleCredential.setUserName(submoduleCredential.getUserName());
+ resolvedSubmoduleCredential.setPasswordSecret(build.getSecretValue(submoduleCredential.getPasswordSecret()));
+ submoduleCredentials.add(resolvedSubmoduleCredential);
+ }
+ }
JobContext jobContext = new JobContext(projectName, projectGitDir, job.getEnvironment(), serverWorkspace,
- envVars, commands, job.isRetrieveSource(), commitId, job.getCaches(),
+ envVars, commands, job.isRetrieveSource(), submoduleCredentials, commitId, job.getCaches(),
new PatternSet(includeFiles, excludeFiles), executor.getCacheTTL(), logger) {
@Override
diff --git a/server-core/src/main/java/io/onedev/server/ci/job/Job.java b/server-core/src/main/java/io/onedev/server/ci/job/Job.java
index 1ff8198a8b..982e0f60c5 100644
--- a/server-core/src/main/java/io/onedev/server/ci/job/Job.java
+++ b/server-core/src/main/java/io/onedev/server/ci/job/Job.java
@@ -23,12 +23,14 @@ import io.onedev.server.ci.JobDependency;
import io.onedev.server.ci.job.param.JobParam;
import io.onedev.server.ci.job.trigger.JobTrigger;
import io.onedev.server.event.ProjectEvent;
+import io.onedev.server.util.OneContext;
import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.util.validation.Validatable;
import io.onedev.server.util.validation.annotation.ClassValidating;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.Horizontal;
import io.onedev.server.web.editable.annotation.Script;
+import io.onedev.server.web.editable.annotation.ShowCondition;
@Editable
@Horizontal
@@ -49,6 +51,8 @@ public class Job implements Serializable, Validatable {
private boolean retrieveSource = true;
+ private List<SubmoduleCredential> submoduleCredentials = new ArrayList<>();
+
private List<JobDependency> dependencies = new ArrayList<>();
private List<JobOutcome> outcomes = new ArrayList<>();
@@ -105,16 +109,31 @@ public class Job implements Serializable, Validatable {
this.commands = commands;
}
- @Editable(order=130, description="Whether or not to retrieve the source code. If enabled, the repository will be "
- + "retrieved into job workspace")
+ @Editable(order=130, description="Check this to retrieve files stored in the repository into job workspace")
public boolean isRetrieveSource() {
return retrieveSource;
}
public void setRetrieveSource(boolean retrieveSource) {
this.retrieveSource = retrieveSource;
- }
+ }
+
+ @Editable(order=135, description="For git submodules accessing via http/https, you will "
+ + "need to specify credentials here if required")
+ @ShowCondition("isSubmoduleCredentialsVisible")
+ public List<SubmoduleCredential> getSubmoduleCredentials() {
+ return submoduleCredentials;
+ }
+
+ public void setSubmoduleCredentials(List<SubmoduleCredential> submoduleCredentials) {
+ this.submoduleCredentials = submoduleCredentials;
+ }
+ @SuppressWarnings("unused")
+ private static boolean isSubmoduleCredentialsVisible() {
+ return (boolean) OneContext.get().getEditContext().getInputValue("retrieveSource");
+ }
+
@Editable(name="Dependency Jobs", order=140, description="Job dependencies determines the order and "
+ "concurrency when run different jobs")
public List<JobDependency> getDependencies() {
@@ -217,6 +236,22 @@ public class Job implements Serializable, Validatable {
}
}
+ if (retrieveSource) {
+ int index = 0;
+ for (SubmoduleCredential credential: submoduleCredentials) {
+ if (credential.getUrl() != null
+ && !credential.getUrl().startsWith("http://")
+ && !credential.getUrl().startsWith("https://")) {
+ isValid = false;
+ context.buildConstraintViolationWithTemplate("Can only provide credentials for submodules accessing via http/https")
+ .addPropertyNode("submoduleCredentials").addPropertyNode("url")
+ .inIterable().atIndex(index)
+ .addConstraintViolation();
+ }
+ index++;
+ }
+ }
+
if (!isValid)
context.disableDefaultConstraintViolation();
diff --git a/server-core/src/main/java/io/onedev/server/ci/job/JobContext.java b/server-core/src/main/java/io/onedev/server/ci/job/JobContext.java
index 92b9018a74..8dd0bd2f34 100644
--- a/server-core/src/main/java/io/onedev/server/ci/job/JobContext.java
+++ b/server-core/src/main/java/io/onedev/server/ci/job/JobContext.java
@@ -1,20 +1,14 @@
package io.onedev.server.ci.job;
import java.io.File;
-import java.io.IOException;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import org.eclipse.jgit.api.Git;
-import org.eclipse.jgit.api.errors.GitAPIException;
import org.eclipse.jgit.lib.ObjectId;
-import io.onedev.commons.utils.ExceptionUtils;
-import io.onedev.server.git.command.CheckoutCommand;
-import io.onedev.server.git.command.FetchCommand;
import io.onedev.server.util.JobLogger;
import io.onedev.server.util.patternset.PatternSet;
@@ -22,7 +16,7 @@ public abstract class JobContext {
private final String projectName;
- private final File gitDir;
+ private final File projectGitDir;
private final String environment;
@@ -34,6 +28,8 @@ public abstract class JobContext {
private final boolean retrieveSource;
+ private final List<SubmoduleCredential> submoduleCredentials;
+
private final ObjectId commitId;
private final Collection<CacheSpec> cacheSpecs;
@@ -48,17 +44,18 @@ public abstract class JobContext {
private final Map<String, Integer> cacheCounts = new ConcurrentHashMap<>();
- public JobContext(String projectName, File gitDir, String environment,
+ public JobContext(String projectName, File projectGitDir, String environment,
File workspace, Map<String, String> envVars, List<String> commands,
- boolean retrieveSource, ObjectId commitId, Collection<CacheSpec> caches,
- PatternSet collectFiles, int cacheTTL, JobLogger logger) {
+ boolean retrieveSource, List<SubmoduleCredential> submoduleCredentials, ObjectId commitId,
+ Collection<CacheSpec> caches, PatternSet collectFiles, int cacheTTL, JobLogger logger) {
this.projectName = projectName;
- this.gitDir = gitDir;
+ this.projectGitDir = projectGitDir;
this.environment = environment;
this.serverWorkspace = workspace;
this.envVars = envVars;
this.commands = commands;
this.retrieveSource = retrieveSource;
+ this.submoduleCredentials = submoduleCredentials;
this.commitId = commitId;
this.cacheSpecs = caches;
this.collectFiles = collectFiles;
@@ -70,6 +67,10 @@ public abstract class JobContext {
return projectName;
}
+ public File getProjectGitDir() {
+ return projectGitDir;
+ }
+
public String getEnvironment() {
return environment;
}
@@ -93,6 +94,10 @@ public abstract class JobContext {
public boolean isRetrieveSource() {
return retrieveSource;
}
+
+ public List<SubmoduleCredential> getSubmoduleCredentials() {
+ return submoduleCredentials;
+ }
public Collection<CacheSpec> getCacheSpecs() {
return cacheSpecs;
@@ -106,27 +111,6 @@ public abstract class JobContext {
return logger;
}
- private void fetchAndCheckout(File checkoutDir) {
- new FetchCommand(checkoutDir).depth(1).from(gitDir.getAbsolutePath()).refspec(commitId.name()).call();
- new CheckoutCommand(checkoutDir).refspec(commitId.name()).call();
- }
-
- public void retrieveSource(File dir) {
- if (new File(dir, ".git").exists()) {
- try (Git git = Git.open(dir)) {
- fetchAndCheckout(dir);
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- } else {
- try (Git git = Git.init().setDirectory(dir).call()) {
- fetchAndCheckout(dir);
- } catch (GitAPIException e) {
- throw ExceptionUtils.unchecked(e);
- }
- }
- }
-
public int getCacheTTL() {
return cacheTTL;
}
diff --git a/server-core/src/main/java/io/onedev/server/ci/job/SubmoduleCredential.java b/server-core/src/main/java/io/onedev/server/ci/job/SubmoduleCredential.java
new file mode 100644
index 0000000000..f8d6d963dc
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/ci/job/SubmoduleCredential.java
@@ -0,0 +1,60 @@
+package io.onedev.server.ci.job;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.hibernate.validator.constraints.NotEmpty;
+
+import io.onedev.server.util.OneContext;
+import io.onedev.server.web.editable.annotation.ChoiceProvider;
+import io.onedev.server.web.editable.annotation.Editable;
+
+@Editable
+public class SubmoduleCredential implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private String url;
+
+ private String userName;
+
+ private String passwordSecret;
+
+ @Editable(order=100)
+ @NotEmpty
+ public String getUrl() {
+ return url;
+ }
+
+ public void setUrl(String url) {
+ this.url = url;
+ }
+
+ @Editable(order=200)
+ @NotEmpty
+ public String getUserName() {
+ return userName;
+ }
+
+ public void setUserName(String userName) {
+ this.userName = userName;
+ }
+
+ @Editable(order=300, description="Specify a project secret to be used as password")
+ @ChoiceProvider("getPasswordSecretChoices")
+ @NotEmpty
+ public String getPasswordSecret() {
+ return passwordSecret;
+ }
+
+ public void setPasswordSecret(String passwordSecret) {
+ this.passwordSecret = passwordSecret;
+ }
+
+ @SuppressWarnings("unused")
+ private static List<String> getPasswordSecretChoices() {
+ return OneContext.get().getProject().getSecrets().stream().map(it->it.getName()).collect(Collectors.toList());
+ }
+
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
index 815ba07924..e602563a5f 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
@@ -58,8 +58,8 @@ import io.onedev.server.persistence.TransactionManager;
import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.AbstractEntityManager;
import io.onedev.server.persistence.dao.Dao;
-import io.onedev.server.security.SecurityUtils;
import io.onedev.server.security.permission.ProjectPrivilege;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.Usage;
import io.onedev.server.util.facade.GroupAuthorizationFacade;
import io.onedev.server.util.facade.MembershipFacade;
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
index 318f804c5e..b7fd35adae 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
@@ -121,10 +121,10 @@ import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.EntitySort;
import io.onedev.server.search.entity.EntitySort.Direction;
import io.onedev.server.search.entity.pullrequest.PullRequestQuery;
-import io.onedev.server.security.SecurityUtils;
import io.onedev.server.security.permission.ProjectPermission;
import io.onedev.server.security.permission.ProjectPrivilege;
import io.onedev.server.util.PullRequestConstants;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.facade.ProjectFacade;
import io.onedev.server.util.facade.UserFacade;
import io.onedev.server.util.markdown.MarkdownManager;
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestReviewManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestReviewManager.java
index bfd97dd2ed..b3cf082065 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestReviewManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestReviewManager.java
@@ -26,7 +26,7 @@ import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.AbstractEntityManager;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.persistence.dao.EntityCriteria;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
@Singleton
public class DefaultPullRequestReviewManager extends AbstractEntityManager<PullRequestReview> implements PullRequestReviewManager {
diff --git a/server-core/src/main/java/io/onedev/server/git/GitFilter.java b/server-core/src/main/java/io/onedev/server/git/GitFilter.java
index fa5f30589e..c26e6a7eff 100644
--- a/server-core/src/main/java/io/onedev/server/git/GitFilter.java
+++ b/server-core/src/main/java/io/onedev/server/git/GitFilter.java
@@ -1,269 +1,269 @@
-package io.onedev.server.git;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ExecutionException;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.shiro.authz.UnauthorizedException;
-import org.eclipse.jgit.http.server.GitSmartHttpTools;
-import org.eclipse.jgit.http.server.ServletUtils;
-import org.eclipse.jgit.transport.PacketLineOut;
-import org.hibernate.Hibernate;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import io.onedev.commons.utils.concurrent.PrioritizedRunnable;
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.ProjectManager;
-import io.onedev.server.entitymanager.SettingManager;
-import io.onedev.server.git.command.AdvertiseReceiveRefsCommand;
-import io.onedev.server.git.command.AdvertiseUploadRefsCommand;
-import io.onedev.server.git.command.ReceiveCommand;
-import io.onedev.server.git.command.UploadCommand;
-import io.onedev.server.git.exception.GitException;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.User;
-import io.onedev.server.persistence.annotation.Sessional;
-import io.onedev.server.security.CodePullAuthorizationSource;
-import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.storage.StorageManager;
-import io.onedev.server.util.ServerConfig;
-import io.onedev.server.util.work.WorkExecutor;
-
-@Singleton
-public class GitFilter implements Filter {
-
- private static final Logger logger = LoggerFactory.getLogger(GitFilter.class);
-
- private static final int PRIORITY = 2;
-
- private static final String INFO_REFS = "info/refs";
-
- private final OneDev oneDev;
-
- private final StorageManager storageManager;
-
- private final ProjectManager projectManager;
-
- private final WorkExecutor workExecutor;
-
- private final ServerConfig serverConfig;
-
- private final SettingManager configManager;
-
- private final Set<CodePullAuthorizationSource> codePullAuthorizationSources;
-
- @Inject
- public GitFilter(OneDev oneDev, StorageManager storageManager, ProjectManager projectManager,
- WorkExecutor workManager, ServerConfig serverConfig, SettingManager configManager,
- Set<CodePullAuthorizationSource> codePullAuthorizationSources) {
- this.oneDev = oneDev;
- this.storageManager = storageManager;
- this.projectManager = projectManager;
- this.workExecutor = workManager;
- this.serverConfig = serverConfig;
- this.configManager = configManager;
- this.codePullAuthorizationSources = codePullAuthorizationSources;
- }
-
- private String getPathInfo(HttpServletRequest request) {
- String pathInfo = request.getRequestURI().substring(request.getContextPath().length());
- return StringUtils.stripStart(pathInfo, "/");
- }
-
- @Sessional
- protected Project getProject(HttpServletRequest request, HttpServletResponse response, String projectInfo)
- throws IOException {
- projectInfo = StringUtils.stripStart(StringUtils.stripEnd(projectInfo, "/"), "/");
-
- if (StringUtils.isBlank(projectInfo) || !projectInfo.startsWith("projects/")) {
- String url = request.getRequestURL().toString();
- String urlRoot = url.substring(0, url.length()-getPathInfo(request).length());
- throw new GitException(String.format("Expecting url of format %sprojects/<project name>", urlRoot));
- }
-
- String projectName = StringUtils.substringAfter(projectInfo, "/");
-
- Project project = projectManager.find(projectName);
- if (project == null)
- throw new GitException(String.format("Unable to find project %s", projectName));
- else
- Hibernate.initialize(project);
-
- return project;
- }
-
- private void doNotCache(HttpServletResponse response) {
- response.setHeader("Expires", "Fri, 01 Jan 1980 00:00:00 GMT");
- response.setHeader("Pragma", "no-cache");
- response.setHeader("Cache-Control", "no-cache, max-age=0, must-revalidate");
- }
-
- protected void processPacks(final HttpServletRequest request, final HttpServletResponse response)
- throws ServletException, IOException, InterruptedException, ExecutionException {
- String pathInfo = getPathInfo(request);
-
- String service = StringUtils.substringAfterLast(pathInfo, "/");
-
- String projectInfo = StringUtils.substringBeforeLast(pathInfo, "/");
- Project project = getProject(request, response, projectInfo);
-
- doNotCache(response);
- response.setHeader("Content-Type", "application/x-" + service + "-result");
-
- Map<String, String> environments = new HashMap<>();
- String serverUrl;
- if (serverConfig.getHttpPort() != 0)
- serverUrl = "http://localhost:" + serverConfig.getHttpPort();
- else
- serverUrl = "https://localhost:" + serverConfig.getHttpsPort();
-
- environments.put("ONEDEV_CURL", configManager.getSystemSetting().getCurlConfig().getExecutable());
- environments.put("ONEDEV_URL", serverUrl);
- environments.put("ONEDEV_USER_ID", User.getCurrentId().toString());
- environments.put("ONEDEV_REPOSITORY_ID", project.getId().toString());
-
- // to be compatible with old repository
- environments.put("GITPLEX_CURL", configManager.getSystemSetting().getCurlConfig().getExecutable());
- environments.put("GITPLEX_URL", serverUrl);
- environments.put("GITPLEX_USER_ID", User.getCurrentId().toString());
- environments.put("GITPLEX_REPOSITORY_ID", project.getId().toString());
-
- File gitDir = storageManager.getProjectGitDir(project.getId());
-
- if (GitSmartHttpTools.isUploadPack(request)) {
- checkPullPermission(request, project);
- workExecutor.submit(new PrioritizedRunnable(PRIORITY) {
-
- @Override
- public void run() {
- try {
- InputStream is = ServletUtils.getInputStream(request);
- OutputStream os = response.getOutputStream();
- new UploadCommand(gitDir, environments).input(is).output(os).call();
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- }).get();
- } else {
- if (!SecurityUtils.canWriteCode(project.getFacade()))
- throw new UnauthorizedException("You do not have permission to push to this project.");
- workExecutor.submit(new PrioritizedRunnable(PRIORITY) {
-
- @Override
- public void run() {
- try {
- InputStream is = ServletUtils.getInputStream(request);
- OutputStream os = response.getOutputStream();
- new ReceiveCommand(gitDir, environments).input(is).output(os).call();
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- }).get();
- }
- }
-
- private void writeInitial(HttpServletResponse response, String service) throws IOException {
- doNotCache(response);
- response.setHeader("Content-Type", "application/x-" + service + "-advertisement");
-
- PacketLineOut pack = new PacketLineOut(response.getOutputStream());
- pack.setFlushOnEnd(false);
- pack.writeString("# service=" + service + "\n");
- pack.end();
- }
-
- private void checkPullPermission(HttpServletRequest request, Project project) {
- if (!SecurityUtils.canReadCode(project.getFacade())) {
- boolean isAuthorized = false;
- for (CodePullAuthorizationSource source: codePullAuthorizationSources) {
- if (source.canPullCode(request, project)) {
- isAuthorized = true;
- break;
- }
- }
- if (!isAuthorized)
- throw new UnauthorizedException("You do not have permission to pull from this project.");
- }
- }
-
- protected void processRefs(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
- String pathInfo = request.getRequestURI().substring(request.getContextPath().length());
- pathInfo = StringUtils.stripStart(pathInfo, "/");
-
- String projectInfo = pathInfo.substring(0, pathInfo.length() - INFO_REFS.length());
- Project project = getProject(request, response, projectInfo);
- String service = request.getParameter("service");
-
- File gitDir = storageManager.getProjectGitDir(project.getId());
-
- if (service.contains("upload")) {
- checkPullPermission(request, project);
- writeInitial(response, service);
- new AdvertiseUploadRefsCommand(gitDir).output(response.getOutputStream()).call();
- } else {
- if (!SecurityUtils.canWriteCode(project.getFacade())) {
- throw new UnauthorizedException("You do not have permission to push to this project.");
- }
- writeInitial(response, service);
- new AdvertiseReceiveRefsCommand(gitDir).output(response.getOutputStream()).call();
- }
- }
-
- @Override
- public void init(FilterConfig filterConfig) throws ServletException {
- }
-
- @Override
- public void doFilter(ServletRequest request, ServletResponse response,
- FilterChain chain) throws IOException, ServletException {
- HttpServletRequest httpRequest = (HttpServletRequest) request;
- HttpServletResponse httpResponse = (HttpServletResponse) response;
-
- try {
- if (GitSmartHttpTools.isInfoRefs(httpRequest)) {
- if (oneDev.isReady())
- processRefs(httpRequest, httpResponse);
- else
- throw new GitException("Server is not ready");
- } else if (GitSmartHttpTools.isReceivePack(httpRequest) || GitSmartHttpTools.isUploadPack(httpRequest)) {
- if (oneDev.isReady())
- processPacks(httpRequest, httpResponse);
- else
- throw new GitException("Server is not ready");
- } else {
- chain.doFilter(request, response);
- }
- } catch (GitException|InterruptedException|ExecutionException e) {
- logger.error("Error serving git request", e);
- GitSmartHttpTools.sendError(httpRequest, httpResponse, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e.getMessage());
- }
- }
-
- @Override
- public void destroy() {
- }
-
-}
+package io.onedev.server.git;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ExecutionException;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.authz.UnauthorizedException;
+import org.eclipse.jgit.http.server.GitSmartHttpTools;
+import org.eclipse.jgit.http.server.ServletUtils;
+import org.eclipse.jgit.transport.PacketLineOut;
+import org.hibernate.Hibernate;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import io.onedev.commons.utils.concurrent.PrioritizedRunnable;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.git.command.AdvertiseReceiveRefsCommand;
+import io.onedev.server.git.command.AdvertiseUploadRefsCommand;
+import io.onedev.server.git.command.ReceiveCommand;
+import io.onedev.server.git.command.UploadCommand;
+import io.onedev.server.git.exception.GitException;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
+import io.onedev.server.persistence.annotation.Sessional;
+import io.onedev.server.security.CodePullAuthorizationSource;
+import io.onedev.server.storage.StorageManager;
+import io.onedev.server.util.SecurityUtils;
+import io.onedev.server.util.ServerConfig;
+import io.onedev.server.util.work.WorkExecutor;
+
+@Singleton
+public class GitFilter implements Filter {
+
+ private static final Logger logger = LoggerFactory.getLogger(GitFilter.class);
+
+ private static final int PRIORITY = 2;
+
+ private static final String INFO_REFS = "info/refs";
+
+ private final OneDev oneDev;
+
+ private final StorageManager storageManager;
+
+ private final ProjectManager projectManager;
+
+ private final WorkExecutor workExecutor;
+
+ private final ServerConfig serverConfig;
+
+ private final SettingManager configManager;
+
+ private final Set<CodePullAuthorizationSource> codePullAuthorizationSources;
+
+ @Inject
+ public GitFilter(OneDev oneDev, StorageManager storageManager, ProjectManager projectManager,
+ WorkExecutor workManager, ServerConfig serverConfig, SettingManager configManager,
+ Set<CodePullAuthorizationSource> codePullAuthorizationSources) {
+ this.oneDev = oneDev;
+ this.storageManager = storageManager;
+ this.projectManager = projectManager;
+ this.workExecutor = workManager;
+ this.serverConfig = serverConfig;
+ this.configManager = configManager;
+ this.codePullAuthorizationSources = codePullAuthorizationSources;
+ }
+
+ private String getPathInfo(HttpServletRequest request) {
+ String pathInfo = request.getRequestURI().substring(request.getContextPath().length());
+ return StringUtils.stripStart(pathInfo, "/");
+ }
+
+ @Sessional
+ protected Project getProject(HttpServletRequest request, HttpServletResponse response, String projectInfo)
+ throws IOException {
+ projectInfo = StringUtils.stripStart(StringUtils.stripEnd(projectInfo, "/"), "/");
+
+ if (StringUtils.isBlank(projectInfo) || !projectInfo.startsWith("projects/")) {
+ String url = request.getRequestURL().toString();
+ String urlRoot = url.substring(0, url.length()-getPathInfo(request).length());
+ throw new GitException(String.format("Expecting url of format %sprojects/<project name>", urlRoot));
+ }
+
+ String projectName = StringUtils.substringAfter(projectInfo, "/");
+
+ Project project = projectManager.find(projectName);
+ if (project == null)
+ throw new GitException(String.format("Unable to find project %s", projectName));
+ else
+ Hibernate.initialize(project);
+
+ return project;
+ }
+
+ private void doNotCache(HttpServletResponse response) {
+ response.setHeader("Expires", "Fri, 01 Jan 1980 00:00:00 GMT");
+ response.setHeader("Pragma", "no-cache");
+ response.setHeader("Cache-Control", "no-cache, max-age=0, must-revalidate");
+ }
+
+ protected void processPacks(final HttpServletRequest request, final HttpServletResponse response)
+ throws ServletException, IOException, InterruptedException, ExecutionException {
+ String pathInfo = getPathInfo(request);
+
+ String service = StringUtils.substringAfterLast(pathInfo, "/");
+
+ String projectInfo = StringUtils.substringBeforeLast(pathInfo, "/");
+ Project project = getProject(request, response, projectInfo);
+
+ doNotCache(response);
+ response.setHeader("Content-Type", "application/x-" + service + "-result");
+
+ Map<String, String> environments = new HashMap<>();
+ String serverUrl;
+ if (serverConfig.getHttpPort() != 0)
+ serverUrl = "http://localhost:" + serverConfig.getHttpPort();
+ else
+ serverUrl = "https://localhost:" + serverConfig.getHttpsPort();
+
+ environments.put("ONEDEV_CURL", configManager.getSystemSetting().getCurlConfig().getExecutable());
+ environments.put("ONEDEV_URL", serverUrl);
+ environments.put("ONEDEV_USER_ID", User.getCurrentId().toString());
+ environments.put("ONEDEV_REPOSITORY_ID", project.getId().toString());
+
+ // to be compatible with old repository
+ environments.put("GITPLEX_CURL", configManager.getSystemSetting().getCurlConfig().getExecutable());
+ environments.put("GITPLEX_URL", serverUrl);
+ environments.put("GITPLEX_USER_ID", User.getCurrentId().toString());
+ environments.put("GITPLEX_REPOSITORY_ID", project.getId().toString());
+
+ File gitDir = storageManager.getProjectGitDir(project.getId());
+
+ if (GitSmartHttpTools.isUploadPack(request)) {
+ checkPullPermission(request, project);
+ workExecutor.submit(new PrioritizedRunnable(PRIORITY) {
+
+ @Override
+ public void run() {
+ try {
+ InputStream is = ServletUtils.getInputStream(request);
+ OutputStream os = response.getOutputStream();
+ new UploadCommand(gitDir, environments).input(is).output(os).call();
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ }).get();
+ } else {
+ if (!SecurityUtils.canWriteCode(project.getFacade()))
+ throw new UnauthorizedException("You do not have permission to push to this project.");
+ workExecutor.submit(new PrioritizedRunnable(PRIORITY) {
+
+ @Override
+ public void run() {
+ try {
+ InputStream is = ServletUtils.getInputStream(request);
+ OutputStream os = response.getOutputStream();
+ new ReceiveCommand(gitDir, environments).input(is).output(os).call();
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ }).get();
+ }
+ }
+
+ private void writeInitial(HttpServletResponse response, String service) throws IOException {
+ doNotCache(response);
+ response.setHeader("Content-Type", "application/x-" + service + "-advertisement");
+
+ PacketLineOut pack = new PacketLineOut(response.getOutputStream());
+ pack.setFlushOnEnd(false);
+ pack.writeString("# service=" + service + "\n");
+ pack.end();
+ }
+
+ private void checkPullPermission(HttpServletRequest request, Project project) {
+ if (!SecurityUtils.canReadCode(project.getFacade())) {
+ boolean isAuthorized = false;
+ for (CodePullAuthorizationSource source: codePullAuthorizationSources) {
+ if (source.canPullCode(request, project)) {
+ isAuthorized = true;
+ break;
+ }
+ }
+ if (!isAuthorized)
+ throw new UnauthorizedException("You do not have permission to pull from this project.");
+ }
+ }
+
+ protected void processRefs(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ String pathInfo = request.getRequestURI().substring(request.getContextPath().length());
+ pathInfo = StringUtils.stripStart(pathInfo, "/");
+
+ String projectInfo = pathInfo.substring(0, pathInfo.length() - INFO_REFS.length());
+ Project project = getProject(request, response, projectInfo);
+ String service = request.getParameter("service");
+
+ File gitDir = storageManager.getProjectGitDir(project.getId());
+
+ if (service.contains("upload")) {
+ checkPullPermission(request, project);
+ writeInitial(response, service);
+ new AdvertiseUploadRefsCommand(gitDir).output(response.getOutputStream()).call();
+ } else {
+ if (!SecurityUtils.canWriteCode(project.getFacade())) {
+ throw new UnauthorizedException("You do not have permission to push to this project.");
+ }
+ writeInitial(response, service);
+ new AdvertiseReceiveRefsCommand(gitDir).output(response.getOutputStream()).call();
+ }
+ }
+
+ @Override
+ public void init(FilterConfig filterConfig) throws ServletException {
+ }
+
+ @Override
+ public void doFilter(ServletRequest request, ServletResponse response,
+ FilterChain chain) throws IOException, ServletException {
+ HttpServletRequest httpRequest = (HttpServletRequest) request;
+ HttpServletResponse httpResponse = (HttpServletResponse) response;
+
+ try {
+ if (GitSmartHttpTools.isInfoRefs(httpRequest)) {
+ if (oneDev.isReady())
+ processRefs(httpRequest, httpResponse);
+ else
+ throw new GitException("Server is not ready");
+ } else if (GitSmartHttpTools.isReceivePack(httpRequest) || GitSmartHttpTools.isUploadPack(httpRequest)) {
+ if (oneDev.isReady())
+ processPacks(httpRequest, httpResponse);
+ else
+ throw new GitException("Server is not ready");
+ } else {
+ chain.doFilter(request, response);
+ }
+ } catch (GitException|InterruptedException|ExecutionException e) {
+ logger.error("Error serving git request", e);
+ GitSmartHttpTools.sendError(httpRequest, httpResponse, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e.getMessage());
+ }
+ }
+
+ @Override
+ public void destroy() {
+ }
+
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/git/GitUtils.java b/server-core/src/main/java/io/onedev/server/git/GitUtils.java
index 175ee7f4c5..75a8e175c6 100644
--- a/server-core/src/main/java/io/onedev/server/git/GitUtils.java
+++ b/server-core/src/main/java/io/onedev/server/git/GitUtils.java
@@ -321,7 +321,7 @@ public class GitUtils {
}
public static void fetch(Repository fromRepository, ObjectId fromCommit, Repository toRepository) {
- new FetchCommand(toRepository.getDirectory())
+ new FetchCommand(toRepository.getDirectory(), null)
.from(fromRepository.getDirectory().getAbsolutePath())
.refspec(fromCommit.name())
.call();
diff --git a/server-core/src/main/java/io/onedev/server/git/command/CheckoutCommand.java b/server-core/src/main/java/io/onedev/server/git/command/CheckoutCommand.java
index 503b151b54..c6d715eb2e 100644
--- a/server-core/src/main/java/io/onedev/server/git/command/CheckoutCommand.java
+++ b/server-core/src/main/java/io/onedev/server/git/command/CheckoutCommand.java
@@ -1,53 +1,56 @@
-package io.onedev.server.git.command;
-
-import java.io.File;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.base.Preconditions;
-
-import io.onedev.commons.utils.command.Commandline;
-import io.onedev.commons.utils.command.LineConsumer;
-
-public class CheckoutCommand extends GitCommand<Void> {
-
- private static final Logger logger = LoggerFactory.getLogger(CheckoutCommand.class);
-
- private String refspec;
-
- public CheckoutCommand(final File gitDir) {
- super(gitDir);
- }
-
- public CheckoutCommand refspec(String refspec) {
- this.refspec = refspec;
- return this;
- }
-
- @Override
- public Void call() {
- Preconditions.checkNotNull(refspec, "refspec param has to be specified.");
-
- Commandline cmd = cmd().addArgs("checkout", "--quiet", refspec);
-
- cmd.execute(new LineConsumer() {
-
- @Override
- public void consume(String line) {
- logger.trace(line);
- }
-
- }, new LineConsumer() {
-
- @Override
- public void consume(String line) {
- logger.error(line);
- }
-
- }).checkReturnCode();
-
- return null;
- }
-
-}
+package io.onedev.server.git.command;
+
+import java.io.File;
+import java.util.Map;
+
+import javax.annotation.Nullable;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.base.Preconditions;
+
+import io.onedev.commons.utils.command.Commandline;
+import io.onedev.commons.utils.command.LineConsumer;
+
+public class CheckoutCommand extends GitCommand<Void> {
+
+ private static final Logger logger = LoggerFactory.getLogger(CheckoutCommand.class);
+
+ private String refspec;
+
+ public CheckoutCommand(File gitDir, @Nullable Map<String, String> environments) {
+ super(gitDir, environments);
+ }
+
+ public CheckoutCommand refspec(String refspec) {
+ this.refspec = refspec;
+ return this;
+ }
+
+ @Override
+ public Void call() {
+ Preconditions.checkNotNull(refspec, "refspec param has to be specified.");
+
+ Commandline cmd = cmd().addArgs("checkout", "--quiet", refspec);
+
+ cmd.execute(new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ logger.trace(line);
+ }
+
+ }, new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ logger.error(line);
+ }
+
+ }).checkReturnCode();
+
+ return null;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/git/command/FetchCommand.java b/server-core/src/main/java/io/onedev/server/git/command/FetchCommand.java
index 3da8bfd9b0..aa7be2dce5 100644
--- a/server-core/src/main/java/io/onedev/server/git/command/FetchCommand.java
+++ b/server-core/src/main/java/io/onedev/server/git/command/FetchCommand.java
@@ -1,74 +1,77 @@
-package io.onedev.server.git.command;
-
-import java.io.File;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.base.Preconditions;
-
-import io.onedev.commons.utils.command.Commandline;
-import io.onedev.commons.utils.command.LineConsumer;
-
-public class FetchCommand extends GitCommand<Void> {
-
- private static final Logger logger = LoggerFactory.getLogger(FetchCommand.class);
-
- private String from;
-
- private int depth;
-
- private String[] refspec = new String[0];
-
- public FetchCommand(final File gitDir) {
- super(gitDir);
- }
-
- public FetchCommand from(String from) {
- this.from = from;
- return this;
- }
-
- public FetchCommand refspec(String... refspec) {
- this.refspec = refspec;
- return this;
- }
-
- public FetchCommand depth(int depth) {
- this.depth = depth;
- return this;
- }
-
- @Override
- public Void call() {
- Preconditions.checkNotNull(from, "from param has to be specified.");
-
- Commandline cmd = cmd().addArgs("fetch");
- cmd.addArgs(from);
- cmd.addArgs("--force", "--quiet");
- if (depth != 0)
- cmd.addArgs("--depth", String.valueOf(depth));
-
- for (String each: refspec)
- cmd.addArgs(each);
-
- cmd.execute(new LineConsumer() {
-
- @Override
- public void consume(String line) {
- logger.trace(line);
- }
-
- }, new LineConsumer() {
-
- @Override
- public void consume(String line) {
- logger.error(line);
- }
-
- }).checkReturnCode();
-
- return null;
- }
-
-}
+package io.onedev.server.git.command;
+
+import java.io.File;
+import java.util.Map;
+
+import javax.annotation.Nullable;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.base.Preconditions;
+
+import io.onedev.commons.utils.command.Commandline;
+import io.onedev.commons.utils.command.LineConsumer;
+
+public class FetchCommand extends GitCommand<Void> {
+
+ private static final Logger logger = LoggerFactory.getLogger(FetchCommand.class);
+
+ private String from;
+
+ private int depth;
+
+ private String[] refspec = new String[0];
+
+ public FetchCommand(File gitDir, @Nullable Map<String, String> environments) {
+ super(gitDir, environments);
+ }
+
+ public FetchCommand from(String from) {
+ this.from = from;
+ return this;
+ }
+
+ public FetchCommand refspec(String... refspec) {
+ this.refspec = refspec;
+ return this;
+ }
+
+ public FetchCommand depth(int depth) {
+ this.depth = depth;
+ return this;
+ }
+
+ @Override
+ public Void call() {
+ Preconditions.checkNotNull(from, "from param has to be specified.");
+
+ Commandline cmd = cmd().addArgs("fetch");
+ cmd.addArgs(from);
+ cmd.addArgs("--force", "--quiet");
+ if (depth != 0)
+ cmd.addArgs("--depth", String.valueOf(depth));
+
+ for (String each: refspec)
+ cmd.addArgs(each);
+
+ cmd.execute(new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ logger.trace(line);
+ }
+
+ }, new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ logger.error(line);
+ }
+
+ }).checkReturnCode();
+
+ return null;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/git/command/UploadCommand.java b/server-core/src/main/java/io/onedev/server/git/command/UploadCommand.java
index b5c165852f..f65951b352 100644
--- a/server-core/src/main/java/io/onedev/server/git/command/UploadCommand.java
+++ b/server-core/src/main/java/io/onedev/server/git/command/UploadCommand.java
@@ -51,7 +51,7 @@ public class UploadCommand extends GitCommand<Void> {
@Override
public void consume(String line) {
// This error may happen during a normal shallow fetch/clone
- if (line.contains("The remote end hung up unexpectedly")) {
+ if (line.contains("remote end hung up unexpectedly")) {
toleratedErrors.set(true);
logger.debug(line);
} else {
@@ -63,7 +63,6 @@ public class UploadCommand extends GitCommand<Void> {
if (result.getReturnCode() != 0 && !toleratedErrors.get())
throw result.buildException();
-
return null;
}
diff --git a/server-core/src/main/java/io/onedev/server/model/CodeComment.java b/server-core/src/main/java/io/onedev/server/model/CodeComment.java
index 426546ca30..6ac30624f8 100644
--- a/server-core/src/main/java/io/onedev/server/model/CodeComment.java
+++ b/server-core/src/main/java/io/onedev/server/model/CodeComment.java
@@ -39,8 +39,8 @@ import io.onedev.server.git.BlobIdent;
import io.onedev.server.git.GitUtils;
import io.onedev.server.model.support.CompareContext;
import io.onedev.server.model.support.MarkPos;
-import io.onedev.server.security.SecurityUtils;
import io.onedev.server.storage.AttachmentStorageSupport;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.diff.DiffUtils;
import io.onedev.server.util.diff.WhitespaceOption;
diff --git a/server-core/src/main/java/io/onedev/server/model/Issue.java b/server-core/src/main/java/io/onedev/server/model/Issue.java
index bf94d79415..c2ce32eb9e 100644
--- a/server-core/src/main/java/io/onedev/server/model/Issue.java
+++ b/server-core/src/main/java/io/onedev/server/model/Issue.java
@@ -1,509 +1,509 @@
-package io.onedev.server.model;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-import java.util.stream.Collectors;
-
-import javax.annotation.Nullable;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Index;
-import javax.persistence.JoinColumn;
-import javax.persistence.Lob;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
-import javax.persistence.Version;
-
-import org.apache.commons.lang3.StringUtils;
-import org.eclipse.jgit.lib.ObjectId;
-import org.eclipse.jgit.revwalk.RevCommit;
-
-import com.fasterxml.jackson.annotation.JsonView;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
-
-import edu.emory.mathcs.backport.java.util.Collections;
-import io.onedev.server.OneDev;
-import io.onedev.server.cache.CommitInfoManager;
-import io.onedev.server.cache.UserInfoManager;
-import io.onedev.server.entitymanager.SettingManager;
-import io.onedev.server.model.support.EntityWatch;
-import io.onedev.server.model.support.setting.GlobalIssueSetting;
-import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.storage.AttachmentStorageSupport;
-import io.onedev.server.util.Input;
-import io.onedev.server.util.Referenceable;
-import io.onedev.server.util.facade.IssueFacade;
-import io.onedev.server.util.inputspec.InputSpec;
-import io.onedev.server.util.jackson.DefaultView;
-import io.onedev.server.web.editable.BeanDescriptor;
-import io.onedev.server.web.editable.PropertyDescriptor;
-import io.onedev.server.web.editable.annotation.Editable;
-
-/**
- * @author robin
- *
- */
-@Entity
-@Table(
- indexes={
- @Index(columnList="o_project_id"), @Index(columnList="state"),
- @Index(columnList="title"), @Index(columnList="noSpaceTitle"),
- @Index(columnList="number"), @Index(columnList="submitDate"),
- @Index(columnList="o_submitter_id"), @Index(columnList="voteCount"),
- @Index(columnList="commentCount"), @Index(columnList="o_milestone_id"),
- @Index(columnList="updateDate")},
- uniqueConstraints={@UniqueConstraint(columnNames={"o_project_id", "number"})})
-@Editable
-public class Issue extends AbstractEntity implements Referenceable, AttachmentStorageSupport {
-
- private static final long serialVersionUID = 1L;
-
- @Version
- private long version;
-
- @Column(nullable=false)
- private String state;
-
- @Column(nullable=false)
- private String title;
-
- @Lob
- @Column(length=65535)
- private String description;
-
- @ManyToOne(fetch=FetchType.LAZY)
- @JoinColumn(nullable=false)
- private Project project;
-
- @ManyToOne(fetch=FetchType.LAZY)
- private Milestone milestone;
-
- @ManyToOne(fetch=FetchType.LAZY)
- private User submitter;
-
- private String submitterName;
-
- @Column(nullable=false)
- private Date submitDate;
-
- private int voteCount;
-
- private int commentCount;
-
- @Column(nullable=false)
- private String uuid = UUID.randomUUID().toString();
-
- private long number;
-
- // used for title search in markdown editor
- @Column(nullable=false)
- @JsonView(DefaultView.class)
- private String noSpaceTitle;
-
- @Column(nullable=false)
- private Date updateDate = new Date();
-
- @OneToMany(mappedBy="issue", cascade=CascadeType.REMOVE)
- private Collection<IssueField> fields = new ArrayList<>();
-
- @OneToMany(mappedBy="issue", cascade=CascadeType.REMOVE)
- private Collection<IssueComment> comments = new ArrayList<>();
-
- @OneToMany(mappedBy="issue", cascade=CascadeType.REMOVE)
- private Collection<IssueChange> changes = new ArrayList<>();
-
- @OneToMany(mappedBy="issue", cascade=CascadeType.REMOVE)
- private Collection<IssueVote> votes = new ArrayList<>();
-
- @OneToMany(mappedBy="issue", cascade=CascadeType.REMOVE)
- private Collection<IssueWatch> watches = new ArrayList<>();
-
- private transient List<RevCommit> commits;
-
- public long getVersion() {
- return version;
- }
-
- public String getState() {
- return state;
- }
-
- public void setState(String state) {
- this.state = state;
- }
-
- public String getTitle() {
- return title;
- }
-
- public void setTitle(String title) {
- this.title = title;
- noSpaceTitle = StringUtils.deleteWhitespace(title);
- }
-
- public String getDescription() {
- return description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- public Project getProject() {
- return project;
- }
-
- public void setProject(Project project) {
- this.project = project;
- }
-
- public String getUUID() {
- return uuid;
- }
-
- public void setUUID(String uuid) {
- this.uuid = uuid;
- }
-
- @Override
- public long getNumber() {
- return number;
- }
-
- public void setNumber(long number) {
- this.number = number;
- }
-
- public User getSubmitter() {
- return submitter;
- }
-
- public void setSubmitter(User submitter) {
- this.submitter = submitter;
- }
-
- @Nullable
- public String getSubmitterName() {
- return submitterName;
- }
-
- public Date getSubmitDate() {
- return submitDate;
- }
-
- public void setSubmitDate(Date submitDate) {
- this.submitDate = submitDate;
- }
-
- public Milestone getMilestone() {
- return milestone;
- }
-
- public void setMilestone(Milestone milestone) {
- this.milestone = milestone;
- }
-
- public Collection<IssueComment> getComments() {
- return comments;
- }
-
- public void setComments(Collection<IssueComment> comments) {
- this.comments = comments;
- }
-
- public Collection<IssueChange> getChanges() {
- return changes;
- }
-
- public void setChanges(Collection<IssueChange> changes) {
- this.changes = changes;
- }
-
- public Collection<IssueVote> getVotes() {
- return votes;
- }
-
- public void setVotes(Collection<IssueVote> votes) {
- this.votes = votes;
- }
-
- @Override
- public Collection<IssueWatch> getWatches() {
- return watches;
- }
-
- public void setWatches(Collection<IssueWatch> watches) {
- this.watches = watches;
- }
-
- @Override
- public EntityWatch getWatch(User user, boolean createIfNotExist) {
- if (createIfNotExist) {
- IssueWatch watch = (IssueWatch) super.getWatch(user, false);
- if (watch == null) {
- watch = new IssueWatch();
- watch.setIssue(this);
- watch.setUser(user);
- getWatches().add(watch);
- }
- return watch;
- } else {
- return super.getWatch(user, false);
- }
- }
-
- public int getVoteCount() {
- return voteCount;
- }
-
- public void setVoteCount(int voteCount) {
- this.voteCount = voteCount;
- }
-
- public int getCommentCount() {
- return commentCount;
- }
-
- public void setCommentCount(int commentCount) {
- this.commentCount = commentCount;
- }
-
- public Collection<IssueField> getFields() {
- return fields;
- }
-
- public void setFields(Collection<IssueField> fields) {
- this.fields = fields;
- }
-
- public Date getUpdateDate() {
- return updateDate;
- }
-
- public void setUpdateDate(Date updateDate) {
- this.updateDate = updateDate;
- }
-
- public boolean isVisitedAfter(Date date) {
- User user = SecurityUtils.getUser();
- if (user != null) {
- Date visitDate = OneDev.getInstance(UserInfoManager.class).getIssueVisitDate(user, this);
- return visitDate != null && visitDate.getTime()>date.getTime();
- } else {
- return true;
- }
- }
-
- public Collection<String> getFieldNames() {
- return getFields().stream().map(it->it.getName()).collect(Collectors.toSet());
- }
-
- public Map<String, Input> getFieldInputs() {
- Map<String, Input> inputs = new LinkedHashMap<>();
-
- Map<String, List<IssueField>> fieldMap = new HashMap<>();
- for (IssueField field: getFields()) {
- List<IssueField> fieldsOfName = fieldMap.get(field.getName());
- if (fieldsOfName == null) {
- fieldsOfName = new ArrayList<>();
- fieldMap.put(field.getName(), fieldsOfName);
- }
- fieldsOfName.add(field);
- }
- for (InputSpec fieldSpec: getIssueSetting().getFieldSpecs()) {
- String fieldName = fieldSpec.getName();
- List<IssueField> fields = fieldMap.get(fieldName);
- if (fields != null) {
- String type = fields.iterator().next().getType();
- List<String> values = new ArrayList<>();
- for (IssueField entity: fields) {
- if (entity.getValue() != null)
- values.add(entity.getValue());
- }
- Collections.sort(values);
- if (!fieldSpec.isAllowMultiple() && values.size() > 1)
- values = Lists.newArrayList(values.iterator().next());
- inputs.put(fieldName, new Input(fieldName, type, values));
- }
- }
- return inputs;
- }
-
- public static String getWebSocketObservable(Long issueId) {
- return Issue.class.getName() + ":" + issueId;
- }
-
- @Nullable
- public String getMilestoneName() {
- return getMilestone()!=null? getMilestone().getName():null;
- }
-
- @Nullable
- public Object getFieldValue(String fieldName) {
- Input input = getFieldInputs().get(fieldName);
-
- if (input != null)
- return input.getTypedValue(getIssueSetting().getFieldSpec(fieldName));
- else
- return null;
- }
-
- private GlobalIssueSetting getIssueSetting() {
- return OneDev.getInstance(SettingManager.class).getIssueSetting();
- }
-
- public long getFieldOrdinal(String fieldName, Object fieldValue) {
- GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();
- InputSpec fieldSpec = issueSetting.getFieldSpec(fieldName);
- if (fieldSpec != null)
- return fieldSpec.getOrdinal(fieldValue);
- else
- return -1;
- }
-
- public Serializable getFieldBean(Class<?> fieldBeanClass, boolean withDefaultValue) {
- BeanDescriptor beanDescriptor = new BeanDescriptor(fieldBeanClass);
- Serializable fieldBean = (Serializable) beanDescriptor.newBeanInstance();
-
- for (List<PropertyDescriptor> groupProperties: beanDescriptor.getProperties().values()) {
- for (PropertyDescriptor property: groupProperties) {
- Input input = getFieldInputs().get(property.getDisplayName());
- if (input != null) {
- InputSpec fieldSpec = getIssueSetting().getFieldSpec(input.getName());
- property.setPropertyValue(fieldBean, input.getTypedValue(fieldSpec));
- } else if (!withDefaultValue) {
- property.setPropertyValue(fieldBean, null);
- }
- }
- }
- return fieldBean;
- }
-
- public void removeFields(Collection<String> fieldNames) {
- for (Iterator<IssueField> it = getFields().iterator(); it.hasNext();) {
- if (fieldNames.contains(it.next().getName()))
- it.remove();
- }
- }
-
- public void setFieldValues(Map<String, Object> fieldValues) {
- for (Map.Entry<String, Object> entry: fieldValues.entrySet())
- setFieldValue(entry.getKey(), entry.getValue());
- }
-
- public void setFieldValue(String fieldName, @Nullable Object fieldValue) {
- for (Iterator<IssueField> it = getFields().iterator(); it.hasNext();) {
- if (fieldName.equals(it.next().getName()))
- it.remove();
- }
-
- InputSpec fieldSpec = getIssueSetting().getFieldSpec(fieldName);
- if (fieldSpec != null) {
- long ordinal = getFieldOrdinal(fieldName, fieldValue);
-
- List<String> strings = fieldSpec.convertToStrings(fieldValue);
- if (!strings.isEmpty()) {
- for (String string: strings) {
- IssueField field = new IssueField();
- field.setIssue(this);
- field.setName(fieldName);
- field.setOrdinal(ordinal);
- field.setType(fieldSpec.getType());
- field.setValue(string);
- getFields().add(field);
- }
- } else {
- IssueField field = new IssueField();
- field.setIssue(this);
- field.setName(fieldName);
- field.setOrdinal(ordinal);
- field.setType(fieldSpec.getType());
- getFields().add(field);
- }
- }
- }
-
- public boolean isFieldVisible(String fieldName) {
- return isFieldVisible(fieldName, Sets.newHashSet());
- }
-
- private boolean isFieldVisible(String fieldName, Set<String> checkedFieldNames) {
- if (!checkedFieldNames.add(fieldName))
- return false;
-
- InputSpec fieldSpec = getIssueSetting().getFieldSpec(fieldName);
- if (fieldSpec != null) {
- if (fieldSpec.getShowCondition() != null) {
- Input dependentInput = getFieldInputs().get(fieldSpec.getShowCondition().getInputName());
- if (dependentInput != null) {
- String value;
- if (!dependentInput.getValues().isEmpty())
- value = dependentInput.getValues().iterator().next();
- else
- value = null;
- if (fieldSpec.getShowCondition().getValueMatcher().matches(value))
- return isFieldVisible(dependentInput.getName(), checkedFieldNames);
- else
- return false;
- } else {
- return false;
- }
- } else {
- return true;
- }
- } else {
- return false;
- }
- }
-
- public IssueFacade getFacade() {
- return new IssueFacade(getId(), getProject().getId(), getNumber());
- }
-
- public List<RevCommit> getCommits() {
- if (commits == null) {
- commits = new ArrayList<>();
- CommitInfoManager commitInfoManager = OneDev.getInstance(CommitInfoManager.class);
- for (ObjectId commitId: commitInfoManager.getFixCommits(getProject(), getNumber())) {
- RevCommit commit = getProject().getRevCommit(commitId, false);
- if (commit != null)
- commits.add(commit);
- }
- Collections.sort(commits, new Comparator<RevCommit>() {
-
- @Override
- public int compare(RevCommit o1, RevCommit o2) {
- return o2.getCommitTime() - o1.getCommitTime();
- }
-
- });
- }
- return commits;
- }
-
- @Override
- public String getAttachmentStorageUUID() {
- return uuid;
- }
-
- @Override
- public Project getAttachmentProject() {
- return getProject();
- }
-
-}
+package io.onedev.server.model;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
+import javax.annotation.Nullable;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Index;
+import javax.persistence.JoinColumn;
+import javax.persistence.Lob;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.persistence.UniqueConstraint;
+import javax.persistence.Version;
+
+import org.apache.commons.lang3.StringUtils;
+import org.eclipse.jgit.lib.ObjectId;
+import org.eclipse.jgit.revwalk.RevCommit;
+
+import com.fasterxml.jackson.annotation.JsonView;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+
+import edu.emory.mathcs.backport.java.util.Collections;
+import io.onedev.server.OneDev;
+import io.onedev.server.cache.CommitInfoManager;
+import io.onedev.server.cache.UserInfoManager;
+import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.model.support.EntityWatch;
+import io.onedev.server.model.support.setting.GlobalIssueSetting;
+import io.onedev.server.storage.AttachmentStorageSupport;
+import io.onedev.server.util.Input;
+import io.onedev.server.util.Referenceable;
+import io.onedev.server.util.SecurityUtils;
+import io.onedev.server.util.facade.IssueFacade;
+import io.onedev.server.util.inputspec.InputSpec;
+import io.onedev.server.util.jackson.DefaultView;
+import io.onedev.server.web.editable.BeanDescriptor;
+import io.onedev.server.web.editable.PropertyDescriptor;
+import io.onedev.server.web.editable.annotation.Editable;
+
+/**
+ * @author robin
+ *
+ */
+@Entity
+@Table(
+ indexes={
+ @Index(columnList="o_project_id"), @Index(columnList="state"),
+ @Index(columnList="title"), @Index(columnList="noSpaceTitle"),
+ @Index(columnList="number"), @Index(columnList="submitDate"),
+ @Index(columnList="o_submitter_id"), @Index(columnList="voteCount"),
+ @Index(columnList="commentCount"), @Index(columnList="o_milestone_id"),
+ @Index(columnList="updateDate")},
+ uniqueConstraints={@UniqueConstraint(columnNames={"o_project_id", "number"})})
+@Editable
+public class Issue extends AbstractEntity implements Referenceable, AttachmentStorageSupport {
+
+ private static final long serialVersionUID = 1L;
+
+ @Version
+ private long version;
+
+ @Column(nullable=false)
+ private String state;
+
+ @Column(nullable=false)
+ private String title;
+
+ @Lob
+ @Column(length=65535)
+ private String description;
+
+ @ManyToOne(fetch=FetchType.LAZY)
+ @JoinColumn(nullable=false)
+ private Project project;
+
+ @ManyToOne(fetch=FetchType.LAZY)
+ private Milestone milestone;
+
+ @ManyToOne(fetch=FetchType.LAZY)
+ private User submitter;
+
+ private String submitterName;
+
+ @Column(nullable=false)
+ private Date submitDate;
+
+ private int voteCount;
+
+ private int commentCount;
+
+ @Column(nullable=false)
+ private String uuid = UUID.randomUUID().toString();
+
+ private long number;
+
+ // used for title search in markdown editor
+ @Column(nullable=false)
+ @JsonView(DefaultView.class)
+ private String noSpaceTitle;
+
+ @Column(nullable=false)
+ private Date updateDate = new Date();
+
+ @OneToMany(mappedBy="issue", cascade=CascadeType.REMOVE)
+ private Collection<IssueField> fields = new ArrayList<>();
+
+ @OneToMany(mappedBy="issue", cascade=CascadeType.REMOVE)
+ private Collection<IssueComment> comments = new ArrayList<>();
+
+ @OneToMany(mappedBy="issue", cascade=CascadeType.REMOVE)
+ private Collection<IssueChange> changes = new ArrayList<>();
+
+ @OneToMany(mappedBy="issue", cascade=CascadeType.REMOVE)
+ private Collection<IssueVote> votes = new ArrayList<>();
+
+ @OneToMany(mappedBy="issue", cascade=CascadeType.REMOVE)
+ private Collection<IssueWatch> watches = new ArrayList<>();
+
+ private transient List<RevCommit> commits;
+
+ public long getVersion() {
+ return version;
+ }
+
+ public String getState() {
+ return state;
+ }
+
+ public void setState(String state) {
+ this.state = state;
+ }
+
+ public String getTitle() {
+ return title;
+ }
+
+ public void setTitle(String title) {
+ this.title = title;
+ noSpaceTitle = StringUtils.deleteWhitespace(title);
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public Project getProject() {
+ return project;
+ }
+
+ public void setProject(Project project) {
+ this.project = project;
+ }
+
+ public String getUUID() {
+ return uuid;
+ }
+
+ public void setUUID(String uuid) {
+ this.uuid = uuid;
+ }
+
+ @Override
+ public long getNumber() {
+ return number;
+ }
+
+ public void setNumber(long number) {
+ this.number = number;
+ }
+
+ public User getSubmitter() {
+ return submitter;
+ }
+
+ public void setSubmitter(User submitter) {
+ this.submitter = submitter;
+ }
+
+ @Nullable
+ public String getSubmitterName() {
+ return submitterName;
+ }
+
+ public Date getSubmitDate() {
+ return submitDate;
+ }
+
+ public void setSubmitDate(Date submitDate) {
+ this.submitDate = submitDate;
+ }
+
+ public Milestone getMilestone() {
+ return milestone;
+ }
+
+ public void setMilestone(Milestone milestone) {
+ this.milestone = milestone;
+ }
+
+ public Collection<IssueComment> getComments() {
+ return comments;
+ }
+
+ public void setComments(Collection<IssueComment> comments) {
+ this.comments = comments;
+ }
+
+ public Collection<IssueChange> getChanges() {
+ return changes;
+ }
+
+ public void setChanges(Collection<IssueChange> changes) {
+ this.changes = changes;
+ }
+
+ public Collection<IssueVote> getVotes() {
+ return votes;
+ }
+
+ public void setVotes(Collection<IssueVote> votes) {
+ this.votes = votes;
+ }
+
+ @Override
+ public Collection<IssueWatch> getWatches() {
+ return watches;
+ }
+
+ public void setWatches(Collection<IssueWatch> watches) {
+ this.watches = watches;
+ }
+
+ @Override
+ public EntityWatch getWatch(User user, boolean createIfNotExist) {
+ if (createIfNotExist) {
+ IssueWatch watch = (IssueWatch) super.getWatch(user, false);
+ if (watch == null) {
+ watch = new IssueWatch();
+ watch.setIssue(this);
+ watch.setUser(user);
+ getWatches().add(watch);
+ }
+ return watch;
+ } else {
+ return super.getWatch(user, false);
+ }
+ }
+
+ public int getVoteCount() {
+ return voteCount;
+ }
+
+ public void setVoteCount(int voteCount) {
+ this.voteCount = voteCount;
+ }
+
+ public int getCommentCount() {
+ return commentCount;
+ }
+
+ public void setCommentCount(int commentCount) {
+ this.commentCount = commentCount;
+ }
+
+ public Collection<IssueField> getFields() {
+ return fields;
+ }
+
+ public void setFields(Collection<IssueField> fields) {
+ this.fields = fields;
+ }
+
+ public Date getUpdateDate() {
+ return updateDate;
+ }
+
+ public void setUpdateDate(Date updateDate) {
+ this.updateDate = updateDate;
+ }
+
+ public boolean isVisitedAfter(Date date) {
+ User user = SecurityUtils.getUser();
+ if (user != null) {
+ Date visitDate = OneDev.getInstance(UserInfoManager.class).getIssueVisitDate(user, this);
+ return visitDate != null && visitDate.getTime()>date.getTime();
+ } else {
+ return true;
+ }
+ }
+
+ public Collection<String> getFieldNames() {
+ return getFields().stream().map(it->it.getName()).collect(Collectors.toSet());
+ }
+
+ public Map<String, Input> getFieldInputs() {
+ Map<String, Input> inputs = new LinkedHashMap<>();
+
+ Map<String, List<IssueField>> fieldMap = new HashMap<>();
+ for (IssueField field: getFields()) {
+ List<IssueField> fieldsOfName = fieldMap.get(field.getName());
+ if (fieldsOfName == null) {
+ fieldsOfName = new ArrayList<>();
+ fieldMap.put(field.getName(), fieldsOfName);
+ }
+ fieldsOfName.add(field);
+ }
+ for (InputSpec fieldSpec: getIssueSetting().getFieldSpecs()) {
+ String fieldName = fieldSpec.getName();
+ List<IssueField> fields = fieldMap.get(fieldName);
+ if (fields != null) {
+ String type = fields.iterator().next().getType();
+ List<String> values = new ArrayList<>();
+ for (IssueField entity: fields) {
+ if (entity.getValue() != null)
+ values.add(entity.getValue());
+ }
+ Collections.sort(values);
+ if (!fieldSpec.isAllowMultiple() && values.size() > 1)
+ values = Lists.newArrayList(values.iterator().next());
+ inputs.put(fieldName, new Input(fieldName, type, values));
+ }
+ }
+ return inputs;
+ }
+
+ public static String getWebSocketObservable(Long issueId) {
+ return Issue.class.getName() + ":" + issueId;
+ }
+
+ @Nullable
+ public String getMilestoneName() {
+ return getMilestone()!=null? getMilestone().getName():null;
+ }
+
+ @Nullable
+ public Object getFieldValue(String fieldName) {
+ Input input = getFieldInputs().get(fieldName);
+
+ if (input != null)
+ return input.getTypedValue(getIssueSetting().getFieldSpec(fieldName));
+ else
+ return null;
+ }
+
+ private GlobalIssueSetting getIssueSetting() {
+ return OneDev.getInstance(SettingManager.class).getIssueSetting();
+ }
+
+ public long getFieldOrdinal(String fieldName, Object fieldValue) {
+ GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();
+ InputSpec fieldSpec = issueSetting.getFieldSpec(fieldName);
+ if (fieldSpec != null)
+ return fieldSpec.getOrdinal(fieldValue);
+ else
+ return -1;
+ }
+
+ public Serializable getFieldBean(Class<?> fieldBeanClass, boolean withDefaultValue) {
+ BeanDescriptor beanDescriptor = new BeanDescriptor(fieldBeanClass);
+ Serializable fieldBean = (Serializable) beanDescriptor.newBeanInstance();
+
+ for (List<PropertyDescriptor> groupProperties: beanDescriptor.getProperties().values()) {
+ for (PropertyDescriptor property: groupProperties) {
+ Input input = getFieldInputs().get(property.getDisplayName());
+ if (input != null) {
+ InputSpec fieldSpec = getIssueSetting().getFieldSpec(input.getName());
+ property.setPropertyValue(fieldBean, input.getTypedValue(fieldSpec));
+ } else if (!withDefaultValue) {
+ property.setPropertyValue(fieldBean, null);
+ }
+ }
+ }
+ return fieldBean;
+ }
+
+ public void removeFields(Collection<String> fieldNames) {
+ for (Iterator<IssueField> it = getFields().iterator(); it.hasNext();) {
+ if (fieldNames.contains(it.next().getName()))
+ it.remove();
+ }
+ }
+
+ public void setFieldValues(Map<String, Object> fieldValues) {
+ for (Map.Entry<String, Object> entry: fieldValues.entrySet())
+ setFieldValue(entry.getKey(), entry.getValue());
+ }
+
+ public void setFieldValue(String fieldName, @Nullable Object fieldValue) {
+ for (Iterator<IssueField> it = getFields().iterator(); it.hasNext();) {
+ if (fieldName.equals(it.next().getName()))
+ it.remove();
+ }
+
+ InputSpec fieldSpec = getIssueSetting().getFieldSpec(fieldName);
+ if (fieldSpec != null) {
+ long ordinal = getFieldOrdinal(fieldName, fieldValue);
+
+ List<String> strings = fieldSpec.convertToStrings(fieldValue);
+ if (!strings.isEmpty()) {
+ for (String string: strings) {
+ IssueField field = new IssueField();
+ field.setIssue(this);
+ field.setName(fieldName);
+ field.setOrdinal(ordinal);
+ field.setType(fieldSpec.getType());
+ field.setValue(string);
+ getFields().add(field);
+ }
+ } else {
+ IssueField field = new IssueField();
+ field.setIssue(this);
+ field.setName(fieldName);
+ field.setOrdinal(ordinal);
+ field.setType(fieldSpec.getType());
+ getFields().add(field);
+ }
+ }
+ }
+
+ public boolean isFieldVisible(String fieldName) {
+ return isFieldVisible(fieldName, Sets.newHashSet());
+ }
+
+ private boolean isFieldVisible(String fieldName, Set<String> checkedFieldNames) {
+ if (!checkedFieldNames.add(fieldName))
+ return false;
+
+ InputSpec fieldSpec = getIssueSetting().getFieldSpec(fieldName);
+ if (fieldSpec != null) {
+ if (fieldSpec.getShowCondition() != null) {
+ Input dependentInput = getFieldInputs().get(fieldSpec.getShowCondition().getInputName());
+ if (dependentInput != null) {
+ String value;
+ if (!dependentInput.getValues().isEmpty())
+ value = dependentInput.getValues().iterator().next();
+ else
+ value = null;
+ if (fieldSpec.getShowCondition().getValueMatcher().matches(value))
+ return isFieldVisible(dependentInput.getName(), checkedFieldNames);
+ else
+ return false;
+ } else {
+ return false;
+ }
+ } else {
+ return true;
+ }
+ } else {
+ return false;
+ }
+ }
+
+ public IssueFacade getFacade() {
+ return new IssueFacade(getId(), getProject().getId(), getNumber());
+ }
+
+ public List<RevCommit> getCommits() {
+ if (commits == null) {
+ commits = new ArrayList<>();
+ CommitInfoManager commitInfoManager = OneDev.getInstance(CommitInfoManager.class);
+ for (ObjectId commitId: commitInfoManager.getFixCommits(getProject(), getNumber())) {
+ RevCommit commit = getProject().getRevCommit(commitId, false);
+ if (commit != null)
+ commits.add(commit);
+ }
+ Collections.sort(commits, new Comparator<RevCommit>() {
+
+ @Override
+ public int compare(RevCommit o1, RevCommit o2) {
+ return o2.getCommitTime() - o1.getCommitTime();
+ }
+
+ });
+ }
+ return commits;
+ }
+
+ @Override
+ public String getAttachmentStorageUUID() {
+ return uuid;
+ }
+
+ @Override
+ public Project getAttachmentProject() {
+ return getProject();
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.java
index 299032291d..b6d3ee24a5 100644
--- a/server-core/src/main/java/io/onedev/server/model/Project.java
+++ b/server-core/src/main/java/io/onedev/server/model/Project.java
@@ -118,9 +118,9 @@ import io.onedev.server.model.support.issue.IssueSetting;
import io.onedev.server.model.support.pullrequest.NamedPullRequestQuery;
import io.onedev.server.persistence.SessionManager;
import io.onedev.server.persistence.TransactionManager;
-import io.onedev.server.security.SecurityUtils;
import io.onedev.server.security.permission.DefaultPrivilege;
import io.onedev.server.storage.StorageManager;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.facade.ProjectFacade;
import io.onedev.server.util.jackson.DefaultView;
import io.onedev.server.util.patternset.PatternSet;
diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequest.java b/server-core/src/main/java/io/onedev/server/model/PullRequest.java
index 9bd3c7a38c..1c19ba2e12 100644
--- a/server-core/src/main/java/io/onedev/server/model/PullRequest.java
+++ b/server-core/src/main/java/io/onedev/server/model/PullRequest.java
@@ -51,11 +51,11 @@ import io.onedev.server.model.support.ProjectAndBranch;
import io.onedev.server.model.support.pullrequest.CloseInfo;
import io.onedev.server.model.support.pullrequest.MergePreview;
import io.onedev.server.model.support.pullrequest.MergeStrategy;
-import io.onedev.server.security.SecurityUtils;
import io.onedev.server.storage.AttachmentStorageSupport;
import io.onedev.server.util.IssueUtils;
import io.onedev.server.util.PullRequestConstants;
import io.onedev.server.util.Referenceable;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.diff.WhitespaceOption;
import io.onedev.server.util.jackson.DefaultView;
import io.onedev.server.util.jackson.RestView;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PressButtonTrigger.java b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PressButtonTrigger.java
index 8b259853f3..6c3024afda 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PressButtonTrigger.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PressButtonTrigger.java
@@ -1,94 +1,94 @@
-package io.onedev.server.model.support.issue.transitiontrigger;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.hibernate.validator.constraints.NotEmpty;
-
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.SettingManager;
-import io.onedev.server.model.User;
-import io.onedev.server.model.support.setting.GlobalIssueSetting;
-import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.util.inputspec.InputSpec;
-import io.onedev.server.util.usermatcher.UserMatcher;
-import io.onedev.server.web.editable.annotation.ChoiceProvider;
-import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;
-import io.onedev.server.web.page.project.ProjectPage;
-import io.onedev.server.web.util.WicketUtils;
-
-@Editable(order=100, name="Button is pressed")
-public class PressButtonTrigger implements TransitionTrigger {
-
- private static final long serialVersionUID = 1L;
-
- private String buttonLabel;
-
- private String authorized;
-
- private List<String> promptFields = new ArrayList<>();
-
- @Editable(order=100)
- @NotEmpty
- public String getButtonLabel() {
- return buttonLabel;
- }
-
- public void setButtonLabel(String buttonLabel) {
- this.buttonLabel = buttonLabel;
- }
-
- @Editable(order=200, name="Authorization")
- @io.onedev.server.web.editable.annotation.UserMatcher
- @NotEmpty(message="may not be empty")
- public String getAuthorized() {
- return authorized;
- }
-
- public void setAuthorized(String authorized) {
- this.authorized = authorized;
- }
-
- @Editable(order=500, description="Optionally select fields to prompt when this button is pressed")
- @ChoiceProvider("getFieldChoices")
- @NameOfEmptyValue("No fields to prompt")
- public List<String> getPromptFields() {
- return promptFields;
- }
-
- public void setPromptFields(List<String> promptFields) {
- this.promptFields = promptFields;
- }
-
- @SuppressWarnings("unused")
- private static List<String> getFieldChoices() {
- List<String> fields = new ArrayList<>();
- GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();
- for (InputSpec field: issueSetting.getFieldSpecs())
- fields.add(field.getName());
- return fields;
- }
-
- public void onRenameField(String oldName, String newName) {
- for (int i=0; i<getPromptFields().size(); i++) {
- if (getPromptFields().get(i).equals(oldName))
- getPromptFields().set(i, newName);
- }
- }
-
- public void onDeleteField(String fieldName) {
- for (Iterator<String> it = getPromptFields().iterator(); it.hasNext();) {
- if (it.next().equals(fieldName))
- it.remove();
- }
- }
-
- public boolean isAuthorized() {
- ProjectPage page = (ProjectPage) WicketUtils.getPage();
- User user = SecurityUtils.getUser();
- return user != null && UserMatcher.fromString(getAuthorized()).matches(page.getProject(), user);
- }
-
-}
+package io.onedev.server.model.support.issue.transitiontrigger;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.hibernate.validator.constraints.NotEmpty;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.model.User;
+import io.onedev.server.model.support.setting.GlobalIssueSetting;
+import io.onedev.server.util.SecurityUtils;
+import io.onedev.server.util.inputspec.InputSpec;
+import io.onedev.server.util.usermatcher.UserMatcher;
+import io.onedev.server.web.editable.annotation.ChoiceProvider;
+import io.onedev.server.web.editable.annotation.Editable;
+import io.onedev.server.web.editable.annotation.NameOfEmptyValue;
+import io.onedev.server.web.page.project.ProjectPage;
+import io.onedev.server.web.util.WicketUtils;
+
+@Editable(order=100, name="Button is pressed")
+public class PressButtonTrigger implements TransitionTrigger {
+
+ private static final long serialVersionUID = 1L;
+
+ private String buttonLabel;
+
+ private String authorized;
+
+ private List<String> promptFields = new ArrayList<>();
+
+ @Editable(order=100)
+ @NotEmpty
+ public String getButtonLabel() {
+ return buttonLabel;
+ }
+
+ public void setButtonLabel(String buttonLabel) {
+ this.buttonLabel = buttonLabel;
+ }
+
+ @Editable(order=200, name="Authorization")
+ @io.onedev.server.web.editable.annotation.UserMatcher
+ @NotEmpty(message="may not be empty")
+ public String getAuthorized() {
+ return authorized;
+ }
+
+ public void setAuthorized(String authorized) {
+ this.authorized = authorized;
+ }
+
+ @Editable(order=500, description="Optionally select fields to prompt when this button is pressed")
+ @ChoiceProvider("getFieldChoices")
+ @NameOfEmptyValue("No fields to prompt")
+ public List<String> getPromptFields() {
+ return promptFields;
+ }
+
+ public void setPromptFields(List<String> promptFields) {
+ this.promptFields = promptFields;
+ }
+
+ @SuppressWarnings("unused")
+ private static List<String> getFieldChoices() {
+ List<String> fields = new ArrayList<>();
+ GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();
+ for (InputSpec field: issueSetting.getFieldSpecs())
+ fields.add(field.getName());
+ return fields;
+ }
+
+ public void onRenameField(String oldName, String newName) {
+ for (int i=0; i<getPromptFields().size(); i++) {
+ if (getPromptFields().get(i).equals(oldName))
+ getPromptFields().set(i, newName);
+ }
+ }
+
+ public void onDeleteField(String fieldName) {
+ for (Iterator<String> it = getPromptFields().iterator(); it.hasNext();) {
+ if (it.next().equals(fieldName))
+ it.remove();
+ }
+ }
+
+ public boolean isAuthorized() {
+ ProjectPage page = (ProjectPage) WicketUtils.getPage();
+ User user = SecurityUtils.getUser();
+ return user != null && UserMatcher.fromString(getAuthorized()).matches(page.getProject(), user);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/rest/BuildResource.java b/server-core/src/main/java/io/onedev/server/rest/BuildResource.java
index 5173f0e228..b76f8fc18c 100644
--- a/server-core/src/main/java/io/onedev/server/rest/BuildResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/BuildResource.java
@@ -22,7 +22,7 @@ import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.model.Build;
import io.onedev.server.persistence.dao.EntityCriteria;
import io.onedev.server.rest.jersey.ValidQueryParams;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
@Path("/builds")
@Consumes(MediaType.WILDCARD)
diff --git a/server-core/src/main/java/io/onedev/server/rest/ProjectResource.java b/server-core/src/main/java/io/onedev/server/rest/ProjectResource.java
index aec44b3401..f1d11c3c85 100644
--- a/server-core/src/main/java/io/onedev/server/rest/ProjectResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/ProjectResource.java
@@ -22,7 +22,7 @@ import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.model.Project;
import io.onedev.server.persistence.dao.EntityCriteria;
import io.onedev.server.rest.jersey.ValidQueryParams;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
@Path("/projects")
@Consumes(MediaType.WILDCARD)
diff --git a/server-core/src/main/java/io/onedev/server/rest/PullRequestResource.java b/server-core/src/main/java/io/onedev/server/rest/PullRequestResource.java
index 84609b8d18..197608c3db 100644
--- a/server-core/src/main/java/io/onedev/server/rest/PullRequestResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/PullRequestResource.java
@@ -24,7 +24,7 @@ import io.onedev.server.model.PullRequest;
import io.onedev.server.model.support.pullrequest.CloseInfo;
import io.onedev.server.persistence.dao.EntityCriteria;
import io.onedev.server.rest.jersey.ValidQueryParams;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
@Path("/pulls")
@Consumes(MediaType.WILDCARD)
diff --git a/server-core/src/main/java/io/onedev/server/rest/UserResource.java b/server-core/src/main/java/io/onedev/server/rest/UserResource.java
index 6c1d004e34..3ce8836253 100644
--- a/server-core/src/main/java/io/onedev/server/rest/UserResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/UserResource.java
@@ -23,7 +23,7 @@ import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.model.User;
import io.onedev.server.persistence.dao.EntityCriteria;
import io.onedev.server.rest.jersey.ValidQueryParams;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
@Path("/users")
@Consumes(MediaType.WILDCARD)
diff --git a/server-core/src/main/java/io/onedev/server/search/commit/AuthorCriteria.java b/server-core/src/main/java/io/onedev/server/search/commit/AuthorCriteria.java
index aad9d6ed7e..a26da42f68 100644
--- a/server-core/src/main/java/io/onedev/server/search/commit/AuthorCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/commit/AuthorCriteria.java
@@ -12,7 +12,7 @@ import io.onedev.server.event.RefUpdated;
import io.onedev.server.git.command.RevListCommand;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
public class AuthorCriteria extends CommitCriteria {
diff --git a/server-core/src/main/java/io/onedev/server/search/commit/CommitterCriteria.java b/server-core/src/main/java/io/onedev/server/search/commit/CommitterCriteria.java
index 201b98f3ae..1e44e75656 100644
--- a/server-core/src/main/java/io/onedev/server/search/commit/CommitterCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/commit/CommitterCriteria.java
@@ -12,7 +12,7 @@ import io.onedev.server.event.RefUpdated;
import io.onedev.server.git.command.RevListCommand;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
public class CommitterCriteria extends CommitCriteria {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldOperatorCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldOperatorCriteria.java
index b4a581031f..17dc24ff2e 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldOperatorCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldOperatorCriteria.java
@@ -12,7 +12,7 @@ import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueField;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
public class FieldOperatorCriteria extends FieldCriteria {
diff --git a/server-core/src/main/java/io/onedev/server/util/IssueUtils.java b/server-core/src/main/java/io/onedev/server/util/IssueUtils.java
index 8b5072bf00..74ef5c4614 100644
--- a/server-core/src/main/java/io/onedev/server/util/IssueUtils.java
+++ b/server-core/src/main/java/io/onedev/server/util/IssueUtils.java
@@ -1,172 +1,171 @@
-package io.onedev.server.util;
-
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.StringTokenizer;
-
-import javax.annotation.Nullable;
-
-import org.jsoup.Jsoup;
-import org.jsoup.nodes.Element;
-import org.jsoup.nodes.Node;
-import org.jsoup.nodes.TextNode;
-
-import com.google.common.base.Splitter;
-import com.google.common.collect.Sets;
-
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.ProjectManager;
-import io.onedev.server.entitymanager.SettingManager;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.User;
-import io.onedev.server.model.support.setting.GlobalIssueSetting;
-import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.util.inputspec.InputSpec;
-import io.onedev.server.util.usermatcher.UserMatcher;
-import io.onedev.server.web.editable.BeanDescriptor;
-import io.onedev.server.web.editable.PropertyDescriptor;
-
-public class IssueUtils {
-
- private static final Set<String> FIX_ISSUE_WORDS = Sets.newHashSet("fix", "fixed", "fixes", "resolve", "resolved", "resolves");
-
- private static final String FIELD_BEAN_PREFIX = "IssueFieldBean";
-
- public static void clearFields(Serializable fieldBean) {
- for (List<PropertyDescriptor> groupProperties: new BeanDescriptor(fieldBean.getClass()).getProperties().values()) {
- for (PropertyDescriptor property: groupProperties)
- property.setPropertyValue(fieldBean, null);
- }
- }
-
- @SuppressWarnings("unchecked")
- public static Class<? extends Serializable> defineFieldBeanClass(Project project) {
- String className = FIELD_BEAN_PREFIX + project.getId();
- GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();
- return (Class<? extends Serializable>) InputSpec.defineClass(className, "Issue Fields", issueSetting.getFieldSpecs());
- }
-
- @Nullable
- public static Class<? extends Serializable> loadFieldBeanClass(String className) {
- if (className.startsWith(FIELD_BEAN_PREFIX)) {
- Long projectId = Long.parseLong(className.substring(FIELD_BEAN_PREFIX.length()));
- Project project = OneDev.getInstance(ProjectManager.class).load(projectId);
- return defineFieldBeanClass(project);
- } else {
- return null;
- }
- }
-
- public static Collection<String> getPropertyNames(Project project, Class<?> fieldBeanClass, Collection<String> fieldNames) {
- Collection<String> propertyNames = new HashSet<>();
- SettingManager settingManager = OneDev.getInstance(SettingManager.class);
- User user = SecurityUtils.getUser();
- for (List<PropertyDescriptor> groupProperties: new BeanDescriptor(fieldBeanClass).getProperties().values()) {
- for (PropertyDescriptor property: groupProperties) {
- if (fieldNames.contains(property.getDisplayName())) {
- InputSpec field = settingManager.getIssueSetting().getFieldSpec(property.getDisplayName());
- if (field != null && UserMatcher.fromString(field.getCanBeChangedBy()).matches(project, user))
- propertyNames.add(property.getPropertyName());
- }
- }
- }
- return propertyNames;
- }
-
- public static Map<String, Object> getFieldValues(OneContext context, Serializable fieldBean, Collection<String> fieldNames) {
- OneContext.push(context);
- try {
- Map<String, Object> fieldValues = new HashMap<>();
- BeanDescriptor beanDescriptor = new BeanDescriptor(fieldBean.getClass());
- for (List<PropertyDescriptor> groupProperties: beanDescriptor.getProperties().values()) {
- for (PropertyDescriptor property: groupProperties) {
- if (fieldNames.contains(property.getDisplayName()))
- fieldValues.put(property.getDisplayName(), property.getPropertyValue(fieldBean));
- }
- }
-
- return fieldValues;
- } finally {
- OneContext.pop();
- }
- }
-
- public static Collection<Long> parseFixedIssues(Project project, String commitMessage) {
- Collection<Long> issueNumbers = new HashSet<>();
-
- // Skip unmatched commit message quickly
- boolean found = false;
- String lowerCaseCommitMessage = commitMessage.toLowerCase();
- for (String word: FIX_ISSUE_WORDS) {
- if (lowerCaseCommitMessage.indexOf(word) != -1) {
- found = true;
- break;
- }
- }
-
- if (found) {
- /*
- * Transform commit message with defined transformers first in order not to process issue keys pointing
- * to external issue trackers
- */
- commitMessage = CommitMessageTransformer.transform(commitMessage, project.getCommitMessageTransforms());
-
- // Only process top level text node to skip transformed links above
- Element body = Jsoup.parseBodyFragment(commitMessage).body();
- for (int i=0; i<body.childNodeSize(); i++) {
- Node node = body.childNode(i);
- if (node instanceof TextNode) {
- TextNode textNode = (TextNode) body.childNode(i);
- StringTokenizer tokenizer = new StringTokenizer(textNode.getWholeText());
- while (tokenizer.hasMoreTokens()) {
- String token = tokenizer.nextToken();
- if (FIX_ISSUE_WORDS.contains(token.toLowerCase())) {
- while (FIX_ISSUE_WORDS.contains(parseIssueNumbers(tokenizer, issueNumbers)))
- parseIssueNumbers(tokenizer, issueNumbers);
- }
- }
- }
- }
- }
-
- return issueNumbers;
- }
-
- private static String parseIssueNumbers(StringTokenizer tokenizer, Collection<Long> issueNumbers) {
- boolean issuesFound = false;
- while (tokenizer.hasMoreTokens()) {
- String token = tokenizer.nextToken();
- if (token.startsWith("#")) {
- for (String field: Splitter.on(",").omitEmptyStrings().split(token)) {
- if (field.startsWith("#")) {
- field = field.substring(1);
- int index = 0;
- for (char ch: field.toCharArray()) {
- if (Character.isDigit(ch))
- index++;
- else
- break;
- }
- String digits = field.substring(0, index);
- if (digits.length() != 0) {
- issueNumbers.add(Long.parseLong(digits));
- issuesFound = true;
- if (index == field.length())
- continue;
- }
- }
- return null;
- }
- } else if (!issuesFound || !token.toLowerCase().equals("and") && !token.equals(",")) {
- return token;
- }
- }
- return null;
- }
-
-}
+package io.onedev.server.util;
+
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.StringTokenizer;
+
+import javax.annotation.Nullable;
+
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Element;
+import org.jsoup.nodes.Node;
+import org.jsoup.nodes.TextNode;
+
+import com.google.common.base.Splitter;
+import com.google.common.collect.Sets;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
+import io.onedev.server.model.support.setting.GlobalIssueSetting;
+import io.onedev.server.util.inputspec.InputSpec;
+import io.onedev.server.util.usermatcher.UserMatcher;
+import io.onedev.server.web.editable.BeanDescriptor;
+import io.onedev.server.web.editable.PropertyDescriptor;
+
+public class IssueUtils {
+
+ private static final Set<String> FIX_ISSUE_WORDS = Sets.newHashSet("fix", "fixed", "fixes", "resolve", "resolved", "resolves");
+
+ private static final String FIELD_BEAN_PREFIX = "IssueFieldBean";
+
+ public static void clearFields(Serializable fieldBean) {
+ for (List<PropertyDescriptor> groupProperties: new BeanDescriptor(fieldBean.getClass()).getProperties().values()) {
+ for (PropertyDescriptor property: groupProperties)
+ property.setPropertyValue(fieldBean, null);
+ }
+ }
+
+ @SuppressWarnings("unchecked")
+ public static Class<? extends Serializable> defineFieldBeanClass(Project project) {
+ String className = FIELD_BEAN_PREFIX + project.getId();
+ GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();
+ return (Class<? extends Serializable>) InputSpec.defineClass(className, "Issue Fields", issueSetting.getFieldSpecs());
+ }
+
+ @Nullable
+ public static Class<? extends Serializable> loadFieldBeanClass(String className) {
+ if (className.startsWith(FIELD_BEAN_PREFIX)) {
+ Long projectId = Long.parseLong(className.substring(FIELD_BEAN_PREFIX.length()));
+ Project project = OneDev.getInstance(ProjectManager.class).load(projectId);
+ return defineFieldBeanClass(project);
+ } else {
+ return null;
+ }
+ }
+
+ public static Collection<String> getPropertyNames(Project project, Class<?> fieldBeanClass, Collection<String> fieldNames) {
+ Collection<String> propertyNames = new HashSet<>();
+ SettingManager settingManager = OneDev.getInstance(SettingManager.class);
+ User user = SecurityUtils.getUser();
+ for (List<PropertyDescriptor> groupProperties: new BeanDescriptor(fieldBeanClass).getProperties().values()) {
+ for (PropertyDescriptor property: groupProperties) {
+ if (fieldNames.contains(property.getDisplayName())) {
+ InputSpec field = settingManager.getIssueSetting().getFieldSpec(property.getDisplayName());
+ if (field != null && UserMatcher.fromString(field.getCanBeChangedBy()).matches(project, user))
+ propertyNames.add(property.getPropertyName());
+ }
+ }
+ }
+ return propertyNames;
+ }
+
+ public static Map<String, Object> getFieldValues(OneContext context, Serializable fieldBean, Collection<String> fieldNames) {
+ OneContext.push(context);
+ try {
+ Map<String, Object> fieldValues = new HashMap<>();
+ BeanDescriptor beanDescriptor = new BeanDescriptor(fieldBean.getClass());
+ for (List<PropertyDescriptor> groupProperties: beanDescriptor.getProperties().values()) {
+ for (PropertyDescriptor property: groupProperties) {
+ if (fieldNames.contains(property.getDisplayName()))
+ fieldValues.put(property.getDisplayName(), property.getPropertyValue(fieldBean));
+ }
+ }
+
+ return fieldValues;
+ } finally {
+ OneContext.pop();
+ }
+ }
+
+ public static Collection<Long> parseFixedIssues(Project project, String commitMessage) {
+ Collection<Long> issueNumbers = new HashSet<>();
+
+ // Skip unmatched commit message quickly
+ boolean found = false;
+ String lowerCaseCommitMessage = commitMessage.toLowerCase();
+ for (String word: FIX_ISSUE_WORDS) {
+ if (lowerCaseCommitMessage.indexOf(word) != -1) {
+ found = true;
+ break;
+ }
+ }
+
+ if (found) {
+ /*
+ * Transform commit message with defined transformers first in order not to process issue keys pointing
+ * to external issue trackers
+ */
+ commitMessage = CommitMessageTransformer.transform(commitMessage, project.getCommitMessageTransforms());
+
+ // Only process top level text node to skip transformed links above
+ Element body = Jsoup.parseBodyFragment(commitMessage).body();
+ for (int i=0; i<body.childNodeSize(); i++) {
+ Node node = body.childNode(i);
+ if (node instanceof TextNode) {
+ TextNode textNode = (TextNode) body.childNode(i);
+ StringTokenizer tokenizer = new StringTokenizer(textNode.getWholeText());
+ while (tokenizer.hasMoreTokens()) {
+ String token = tokenizer.nextToken();
+ if (FIX_ISSUE_WORDS.contains(token.toLowerCase())) {
+ while (FIX_ISSUE_WORDS.contains(parseIssueNumbers(tokenizer, issueNumbers)))
+ parseIssueNumbers(tokenizer, issueNumbers);
+ }
+ }
+ }
+ }
+ }
+
+ return issueNumbers;
+ }
+
+ private static String parseIssueNumbers(StringTokenizer tokenizer, Collection<Long> issueNumbers) {
+ boolean issuesFound = false;
+ while (tokenizer.hasMoreTokens()) {
+ String token = tokenizer.nextToken();
+ if (token.startsWith("#")) {
+ for (String field: Splitter.on(",").omitEmptyStrings().split(token)) {
+ if (field.startsWith("#")) {
+ field = field.substring(1);
+ int index = 0;
+ for (char ch: field.toCharArray()) {
+ if (Character.isDigit(ch))
+ index++;
+ else
+ break;
+ }
+ String digits = field.substring(0, index);
+ if (digits.length() != 0) {
+ issueNumbers.add(Long.parseLong(digits));
+ issuesFound = true;
+ if (index == field.length())
+ continue;
+ }
+ }
+ return null;
+ }
+ } else if (!issuesFound || !token.toLowerCase().equals("and") && !token.equals(",")) {
+ return token;
+ }
+ }
+ return null;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/util/PKCS12CertExtractor.java b/server-core/src/main/java/io/onedev/server/util/PKCS12CertExtractor.java
new file mode 100644
index 0000000000..a766adcd61
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/util/PKCS12CertExtractor.java
@@ -0,0 +1,70 @@
+package io.onedev.server.util;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.StringWriter;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.Certificate;
+import java.security.cert.CertificateEncodingException;
+import java.security.cert.CertificateException;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.bouncycastle.util.io.pem.PemObject;
+import org.bouncycastle.util.io.pem.PemWriter;
+
+public class PKCS12CertExtractor {
+
+ private final File file;
+
+ private final String password;
+
+ public PKCS12CertExtractor(File file, String password) {
+ this.file = file;
+ this.password = password;
+ }
+
+ private String getCertContent(Certificate cert) {
+ StringWriter stringWriter = new StringWriter();
+ try (PemWriter pemWriter = new PemWriter(stringWriter)) {
+ pemWriter.writeObject(new PemObject("CERTIFICATE", cert.getEncoded()));
+ pemWriter.flush();
+ } catch (CertificateEncodingException|IOException e) {
+ throw new RuntimeException(e);
+ }
+ return stringWriter.toString().trim();
+ }
+
+ public Map<String, String> extact() {
+ try (InputStream is = new FileInputStream(file)) {
+ Map<String, String> certs = new HashMap<>();
+ KeyStore keystore = KeyStore.getInstance("pkcs12");
+ keystore.load(is, password.toCharArray());
+ Enumeration<String> aliases = keystore.aliases();
+ while (aliases.hasMoreElements()) {
+ String alias = aliases.nextElement();
+ String siteCertContent = getCertContent(keystore.getCertificate(alias));
+ String safeAlias = alias.replaceAll("[^a-zA-Z0-9\\.\\_]", "-");
+ certs.put("keystore-site-cert-" + safeAlias + ".pem", siteCertContent);
+
+ Certificate chain[] = keystore.getCertificateChain(alias);
+ if (chain != null) {
+ for (int i=0; i<chain.length; i++) {
+ String caCertContent = getCertContent(chain[i]);
+ if (!caCertContent.equals(siteCertContent))
+ certs.put("keystore-ca-cert-" + safeAlias + "-" + i + ".pem", caCertContent);
+ }
+ }
+ }
+ return certs;
+ } catch (IOException|KeyStoreException|NoSuchAlgorithmException|CertificateException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java b/server-core/src/main/java/io/onedev/server/util/SecurityUtils.java
similarity index 99%
rename from server-core/src/main/java/io/onedev/server/security/SecurityUtils.java
rename to server-core/src/main/java/io/onedev/server/util/SecurityUtils.java
index ebb1568ed2..5f1fd3569b 100644
--- a/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java
+++ b/server-core/src/main/java/io/onedev/server/util/SecurityUtils.java
@@ -1,4 +1,4 @@
-package io.onedev.server.security;
+package io.onedev.server.util;
import java.util.Collection;
import java.util.HashSet;
diff --git a/server-core/src/main/java/io/onedev/server/util/facade/ProjectFacade.java b/server-core/src/main/java/io/onedev/server/util/facade/ProjectFacade.java
index 17ae9ea5f1..0219f6eb63 100644
--- a/server-core/src/main/java/io/onedev/server/util/facade/ProjectFacade.java
+++ b/server-core/src/main/java/io/onedev/server/util/facade/ProjectFacade.java
@@ -1,57 +1,57 @@
-package io.onedev.server.util.facade;
-
-import java.util.Date;
-
-import io.onedev.server.OneDev;
-import io.onedev.server.cache.UserInfoManager;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.User;
-import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.security.permission.DefaultPrivilege;
-
-public class ProjectFacade extends EntityFacade {
-
- private static final long serialVersionUID = 1L;
-
- private final String name;
-
- private final DefaultPrivilege defaultPrivilege;
-
- public ProjectFacade(Project project) {
- super(project.getId());
- name = project.getName();
- defaultPrivilege = project.getDefaultPrivilege();
- }
-
- public String getName() {
- return name;
- }
-
- public DefaultPrivilege getDefaultPrivilege() {
- return defaultPrivilege;
- }
-
- public static int compareLastVisit(ProjectFacade project1, ProjectFacade project2) {
- User user = SecurityUtils.getUser();
- if (user != null) {
- UserInfoManager userInfoManager = OneDev.getInstance(UserInfoManager.class);
- UserFacade userFacade = user.getFacade();
- Date date1 = userInfoManager.getVisitDate(userFacade, project1);
- Date date2 = userInfoManager.getVisitDate(userFacade, project2);
- if (date1 != null) {
- if (date2 != null)
- return date2.compareTo(date1);
- else
- return -1;
- } else {
- if (date2 != null)
- return 1;
- else
- return project1.compareTo(project2);
- }
- } else {
- return project1.compareTo(project2);
- }
- }
-
-}
+package io.onedev.server.util.facade;
+
+import java.util.Date;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.cache.UserInfoManager;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
+import io.onedev.server.security.permission.DefaultPrivilege;
+import io.onedev.server.util.SecurityUtils;
+
+public class ProjectFacade extends EntityFacade {
+
+ private static final long serialVersionUID = 1L;
+
+ private final String name;
+
+ private final DefaultPrivilege defaultPrivilege;
+
+ public ProjectFacade(Project project) {
+ super(project.getId());
+ name = project.getName();
+ defaultPrivilege = project.getDefaultPrivilege();
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public DefaultPrivilege getDefaultPrivilege() {
+ return defaultPrivilege;
+ }
+
+ public static int compareLastVisit(ProjectFacade project1, ProjectFacade project2) {
+ User user = SecurityUtils.getUser();
+ if (user != null) {
+ UserInfoManager userInfoManager = OneDev.getInstance(UserInfoManager.class);
+ UserFacade userFacade = user.getFacade();
+ Date date1 = userInfoManager.getVisitDate(userFacade, project1);
+ Date date2 = userInfoManager.getVisitDate(userFacade, project2);
+ if (date1 != null) {
+ if (date2 != null)
+ return date2.compareTo(date1);
+ else
+ return -1;
+ } else {
+ if (date2 != null)
+ return 1;
+ else
+ return project1.compareTo(project2);
+ }
+ } else {
+ return project1.compareTo(project2);
+ }
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/CodeReaders.java b/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/CodeReaders.java
index 450a66ac3d..1b5d2a9077 100644
--- a/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/CodeReaders.java
+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/CodeReaders.java
@@ -4,9 +4,9 @@ import java.util.ArrayList;
import java.util.List;
import io.onedev.server.model.Project;
-import io.onedev.server.security.SecurityUtils;
import io.onedev.server.security.permission.ProjectPrivilege;
import io.onedev.server.util.OneContext;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.facade.UserFacade;
import io.onedev.server.web.editable.annotation.Editable;
diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/CodeWriters.java b/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/CodeWriters.java
index 04a9b35af0..32a528d51b 100644
--- a/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/CodeWriters.java
+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/CodeWriters.java
@@ -4,9 +4,9 @@ import java.util.ArrayList;
import java.util.List;
import io.onedev.server.model.Project;
-import io.onedev.server.security.SecurityUtils;
import io.onedev.server.security.permission.ProjectPrivilege;
import io.onedev.server.util.OneContext;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.facade.UserFacade;
import io.onedev.server.web.editable.annotation.Editable;
diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/IssueReaders.java b/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/IssueReaders.java
index c51c954b1a..f6e2e8047a 100644
--- a/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/IssueReaders.java
+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/IssueReaders.java
@@ -4,9 +4,9 @@ import java.util.ArrayList;
import java.util.List;
import io.onedev.server.model.Project;
-import io.onedev.server.security.SecurityUtils;
import io.onedev.server.security.permission.ProjectPrivilege;
import io.onedev.server.util.OneContext;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.facade.UserFacade;
import io.onedev.server.web.editable.annotation.Editable;
diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/ProjectAdministrators.java b/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/ProjectAdministrators.java
index 0059c60419..d0ddf73554 100644
--- a/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/ProjectAdministrators.java
+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/ProjectAdministrators.java
@@ -4,9 +4,9 @@ import java.util.ArrayList;
import java.util.List;
import io.onedev.server.model.Project;
-import io.onedev.server.security.SecurityUtils;
import io.onedev.server.security.permission.ProjectPrivilege;
import io.onedev.server.util.OneContext;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.facade.UserFacade;
import io.onedev.server.web.editable.annotation.Editable;
diff --git a/server-core/src/main/java/io/onedev/server/util/markdown/UrlProcessor.java b/server-core/src/main/java/io/onedev/server/util/markdown/UrlProcessor.java
index 60519fdb31..e6372a673b 100644
--- a/server-core/src/main/java/io/onedev/server/util/markdown/UrlProcessor.java
+++ b/server-core/src/main/java/io/onedev/server/util/markdown/UrlProcessor.java
@@ -22,7 +22,7 @@ import io.onedev.commons.utils.UrlUtils;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.git.GitUtils;
import io.onedev.server.model.Project;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.page.project.blob.ProjectBlobPage;
import io.onedev.server.web.page.project.blob.render.BlobRenderContext;
import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;
diff --git a/server-core/src/main/java/io/onedev/server/util/validation/CurrentPasswordValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/CurrentPasswordValidator.java
index 2e14c70fde..543866793d 100644
--- a/server-core/src/main/java/io/onedev/server/util/validation/CurrentPasswordValidator.java
+++ b/server-core/src/main/java/io/onedev/server/util/validation/CurrentPasswordValidator.java
@@ -6,7 +6,7 @@ import javax.validation.ConstraintValidatorContext;
import org.apache.shiro.authc.AuthenticationToken;
import org.apache.shiro.authc.UsernamePasswordToken;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.validation.annotation.CurrentPassword;
public class CurrentPasswordValidator implements ConstraintValidator<CurrentPassword, String> {
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java
index e41c6010bc..4a1ac16bd4 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java
@@ -45,11 +45,11 @@ import io.onedev.server.model.support.setting.GlobalIssueSetting;
import io.onedev.server.search.entity.issue.IssueQuery;
import io.onedev.server.search.entity.issue.IssueQueryLexer;
import io.onedev.server.search.entity.issue.IssueQueryParser;
-import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
import io.onedev.server.util.EditContext;
import io.onedev.server.util.IssueConstants;
import io.onedev.server.util.OneContext;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.inputspec.BuildChoiceInput;
import io.onedev.server.util.inputspec.InputContext;
import io.onedev.server.util.inputspec.InputSpec;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/branch/create/CreateBranchLink.java b/server-core/src/main/java/io/onedev/server/web/component/branch/create/CreateBranchLink.java
index 4d681d7b2b..155fa322f3 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/branch/create/CreateBranchLink.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/branch/create/CreateBranchLink.java
@@ -6,7 +6,7 @@ import org.apache.wicket.model.IModel;
import org.eclipse.jgit.lib.Constants;
import io.onedev.server.model.Project;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.component.modal.ModalLink;
import io.onedev.server.web.component.modal.ModalPanel;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/branch/create/CreateBranchPanel.java b/server-core/src/main/java/io/onedev/server/web/component/branch/create/CreateBranchPanel.java
index 73c8d4a5a4..491bbd9d01 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/branch/create/CreateBranchPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/branch/create/CreateBranchPanel.java
@@ -17,7 +17,7 @@ import io.onedev.server.git.GitUtils;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.model.support.BranchProtection;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
@SuppressWarnings("serial")
abstract class CreateBranchPanel extends Panel {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
index 9291ba6598..a44e52afe9 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
@@ -53,9 +53,9 @@ import io.onedev.server.model.Build;
import io.onedev.server.model.Build.Status;
import io.onedev.server.model.Project;
import io.onedev.server.search.entity.build.BuildQuery;
-import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.BuildConstants;
import io.onedev.server.util.DateUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.behavior.BuildQueryBehavior;
import io.onedev.server.web.behavior.WebSocketObserver;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java
index 9d99ed7fbc..58ef46f45f 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java
@@ -32,9 +32,9 @@ import io.onedev.server.model.BuildParam;
import io.onedev.server.model.Project;
import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.build.BuildQuery;
-import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
import io.onedev.server.util.Input;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.facade.UserFacade;
import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.util.inputspec.SecretInput;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java
index ed80e184f0..486ad7b102 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java
@@ -45,8 +45,8 @@ import io.onedev.server.model.CodeComment;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.search.entity.codecomment.CodeCommentQuery;
-import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.behavior.CodeCommentQueryBehavior;
import io.onedev.server.web.component.datatable.HistoryAwareDataTable;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java
index fcb9197ed0..04e56a6705 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java
@@ -46,8 +46,8 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
import io.onedev.server.model.support.CompareContext;
-import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.facade.UserFacade;
import io.onedev.server.util.userident.UserIdent;
import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/InvalidCodeCommentPanel.java b/server-core/src/main/java/io/onedev/server/web/component/codecomment/InvalidCodeCommentPanel.java
index db20e27fe6..e5f9b37b56 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/InvalidCodeCommentPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/InvalidCodeCommentPanel.java
@@ -8,7 +8,7 @@ import org.apache.wicket.markup.html.panel.Panel;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.CodeCommentManager;
import io.onedev.server.model.CodeComment;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.util.ConfirmOnClick;
@SuppressWarnings("serial")
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java
index 7344c9bf5c..6a799d81c6 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java
@@ -64,8 +64,8 @@ import io.onedev.server.search.commit.CommitCriteria;
import io.onedev.server.search.commit.CommitQuery;
import io.onedev.server.search.commit.MessageCriteria;
import io.onedev.server.search.commit.PathCriteria;
-import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.Constants;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.web.behavior.CommitQueryBehavior;
import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/createtag/CreateTagLink.java b/server-core/src/main/java/io/onedev/server/web/component/createtag/CreateTagLink.java
index 9027b7736e..22fe5389db 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/createtag/CreateTagLink.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/createtag/CreateTagLink.java
@@ -6,7 +6,7 @@ import org.apache.wicket.model.IModel;
import org.eclipse.jgit.lib.Constants;
import io.onedev.server.model.Project;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.component.modal.ModalLink;
import io.onedev.server.web.component.modal.ModalPanel;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/createtag/CreateTagPanel.java b/server-core/src/main/java/io/onedev/server/web/component/createtag/CreateTagPanel.java
index a18e42e59b..abd6139ba3 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/createtag/CreateTagPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/createtag/CreateTagPanel.java
@@ -1,159 +1,159 @@
-package io.onedev.server.web.component.createtag;
-
-import javax.annotation.Nullable;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.ajax.markup.html.form.AjaxButton;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.form.TextArea;
-import org.apache.wicket.markup.html.form.TextField;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.model.IModel;
-import org.eclipse.jgit.lib.Constants;
-import org.eclipse.jgit.lib.Repository;
-
-import com.google.common.base.Preconditions;
-
-import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
-import io.onedev.server.git.GitUtils;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.User;
-import io.onedev.server.model.support.TagProtection;
-import io.onedev.server.security.SecurityUtils;
-
-@SuppressWarnings("serial")
-public abstract class CreateTagPanel extends Panel {
-
- private final IModel<Project> projectModel;
-
- private final String revision;
-
- private String tagName;
-
- private String tagMessage;
-
- public CreateTagPanel(String id, IModel<Project> projectModel, @Nullable String tagName, String revision) {
- super(id);
- this.projectModel = projectModel;
- this.tagName = tagName;
- this.revision = revision;
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- Form<?> form = new Form<Void>("form");
- form.setOutputMarkupId(true);
- form.add(new NotificationPanel("feedback", form));
-
- Component nameInput;
- if (tagName == null) {
- form.add(nameInput = new TextField<String>("name", new IModel<String>() {
-
- @Override
- public void detach() {
- }
-
- @Override
- public String getObject() {
- return tagName;
- }
-
- @Override
- public void setObject(String object) {
- tagName = object;
- }
-
- }));
- nameInput.setOutputMarkupId(true);
- } else {
- form.add(nameInput = new WebMarkupContainer("name").setVisible(false));
- }
-
- form.add(new TextArea<String>("message", new IModel<String>() {
-
- @Override
- public void detach() {
- }
-
- @Override
- public String getObject() {
- return tagMessage;
- }
-
- @Override
- public void setObject(String object) {
- tagMessage = object;
- }
-
- }));
- form.add(new AjaxButton("create") {
-
- @Override
- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
- super.onSubmit(target, form);
-
- if (tagName == null) {
- form.error("Tag name is required.");
- target.focusComponent(nameInput);
- target.add(form);
- } else if (!Repository.isValidRefName(Constants.R_TAGS + tagName)) {
- form.error("Tag name is not valid.");
- target.focusComponent(nameInput);
- target.add(form);
- } else if (projectModel.getObject().getObjectId(GitUtils.tag2ref(tagName), false) != null) {
- form.error("Tag '" + tagName + "' already exists, please choose a different name.");
- target.focusComponent(nameInput);
- target.add(form);
- } else {
- Project project = projectModel.getObject();
- User user = Preconditions.checkNotNull(SecurityUtils.getUser());
-
- TagProtection protection = project.getTagProtection(tagName, user);
- if (protection != null && protection.isNoCreation()) {
- form.error("Unable to create protected tag");
- target.focusComponent(nameInput);
- target.add(form);
- } else {
- project.createTag(tagName, revision, user.asPerson(), tagMessage);
- onCreate(target, tagName);
- }
- }
- }
-
- });
- form.add(new AjaxLink<Void>("cancel") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- onCancel(target);
- }
-
- });
- form.add(new AjaxLink<Void>("close") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- onCancel(target);
- }
-
- });
- add(form);
- }
-
- protected abstract void onCreate(AjaxRequestTarget target, String tag);
-
- protected abstract void onCancel(AjaxRequestTarget target);
-
- @Override
- protected void onDetach() {
- projectModel.detach();
-
- super.onDetach();
- }
-
-}
+package io.onedev.server.web.component.createtag;
+
+import javax.annotation.Nullable;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.ajax.markup.html.form.AjaxButton;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.form.TextArea;
+import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.model.IModel;
+import org.eclipse.jgit.lib.Constants;
+import org.eclipse.jgit.lib.Repository;
+
+import com.google.common.base.Preconditions;
+
+import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
+import io.onedev.server.git.GitUtils;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
+import io.onedev.server.model.support.TagProtection;
+import io.onedev.server.util.SecurityUtils;
+
+@SuppressWarnings("serial")
+public abstract class CreateTagPanel extends Panel {
+
+ private final IModel<Project> projectModel;
+
+ private final String revision;
+
+ private String tagName;
+
+ private String tagMessage;
+
+ public CreateTagPanel(String id, IModel<Project> projectModel, @Nullable String tagName, String revision) {
+ super(id);
+ this.projectModel = projectModel;
+ this.tagName = tagName;
+ this.revision = revision;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ Form<?> form = new Form<Void>("form");
+ form.setOutputMarkupId(true);
+ form.add(new NotificationPanel("feedback", form));
+
+ Component nameInput;
+ if (tagName == null) {
+ form.add(nameInput = new TextField<String>("name", new IModel<String>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public String getObject() {
+ return tagName;
+ }
+
+ @Override
+ public void setObject(String object) {
+ tagName = object;
+ }
+
+ }));
+ nameInput.setOutputMarkupId(true);
+ } else {
+ form.add(nameInput = new WebMarkupContainer("name").setVisible(false));
+ }
+
+ form.add(new TextArea<String>("message", new IModel<String>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public String getObject() {
+ return tagMessage;
+ }
+
+ @Override
+ public void setObject(String object) {
+ tagMessage = object;
+ }
+
+ }));
+ form.add(new AjaxButton("create") {
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
+ super.onSubmit(target, form);
+
+ if (tagName == null) {
+ form.error("Tag name is required.");
+ target.focusComponent(nameInput);
+ target.add(form);
+ } else if (!Repository.isValidRefName(Constants.R_TAGS + tagName)) {
+ form.error("Tag name is not valid.");
+ target.focusComponent(nameInput);
+ target.add(form);
+ } else if (projectModel.getObject().getObjectId(GitUtils.tag2ref(tagName), false) != null) {
+ form.error("Tag '" + tagName + "' already exists, please choose a different name.");
+ target.focusComponent(nameInput);
+ target.add(form);
+ } else {
+ Project project = projectModel.getObject();
+ User user = Preconditions.checkNotNull(SecurityUtils.getUser());
+
+ TagProtection protection = project.getTagProtection(tagName, user);
+ if (protection != null && protection.isNoCreation()) {
+ form.error("Unable to create protected tag");
+ target.focusComponent(nameInput);
+ target.add(form);
+ } else {
+ project.createTag(tagName, revision, user.asPerson(), tagMessage);
+ onCreate(target, tagName);
+ }
+ }
+ }
+
+ });
+ form.add(new AjaxLink<Void>("cancel") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onCancel(target);
+ }
+
+ });
+ form.add(new AjaxLink<Void>("close") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onCancel(target);
+ }
+
+ });
+ add(form);
+ }
+
+ protected abstract void onCreate(AjaxRequestTarget target, String tag);
+
+ protected abstract void onCancel(AjaxRequestTarget target);
+
+ @Override
+ protected void onDetach() {
+ projectModel.detach();
+
+ super.onDetach();
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.java
index bb63f1b42f..aeae1635cf 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.java
@@ -1,1251 +1,1251 @@
-package io.onedev.server.web.component.diff.blob.text;
-
-import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Nullable;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
-import org.apache.wicket.markup.head.OnLoadHeaderItem;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.model.AbstractReadOnlyModel;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
-import org.apache.wicket.request.IRequestParameters;
-import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.eclipse.jgit.diff.DiffEntry.ChangeType;
-import org.eclipse.jgit.lib.FileMode;
-import org.eclipse.jgit.lib.ObjectId;
-import org.unbescape.html.HtmlEscape;
-import org.unbescape.javascript.JavaScriptEscape;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.base.Preconditions;
-
-import io.onedev.commons.jsyntax.TextToken;
-import io.onedev.commons.jsyntax.TokenUtils;
-import io.onedev.commons.jsyntax.Tokenized;
-import io.onedev.commons.utils.LinearRange;
-import io.onedev.commons.utils.RangeUtils;
-import io.onedev.commons.utils.StringUtils;
-import io.onedev.commons.utils.PlanarRange;
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.CodeCommentManager;
-import io.onedev.server.git.BlameBlock;
-import io.onedev.server.git.BlameCommit;
-import io.onedev.server.git.BlobChange;
-import io.onedev.server.git.BlobIdent;
-import io.onedev.server.git.GitUtils;
-import io.onedev.server.git.command.BlameCommand;
-import io.onedev.server.model.CodeComment;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.support.MarkPos;
-import io.onedev.server.search.code.hit.QueryHit;
-import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.util.DateUtils;
-import io.onedev.server.util.diff.DiffBlock;
-import io.onedev.server.util.diff.DiffMatchPatch.Operation;
-import io.onedev.server.util.diff.DiffUtils;
-import io.onedev.server.util.diff.LineDiff;
-import io.onedev.server.web.WebConstants;
-import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
-import io.onedev.server.web.behavior.blamemessage.BlameMessageBehavior;
-import io.onedev.server.web.component.diff.blob.SourceAware;
-import io.onedev.server.web.component.diff.blob.text.MarkAwareDiffBlock.Type;
-import io.onedev.server.web.component.diff.diffstat.DiffStatBar;
-import io.onedev.server.web.component.diff.difftitle.BlobDiffTitle;
-import io.onedev.server.web.component.diff.revision.BlobCommentSupport;
-import io.onedev.server.web.component.diff.revision.DiffViewMode;
-import io.onedev.server.web.component.link.ViewStateAwarePageLink;
-import io.onedev.server.web.component.symboltooltip.SymbolTooltipPanel;
-import io.onedev.server.web.page.project.blob.ProjectBlobPage;
-import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;
-import io.onedev.server.web.page.project.commits.CommitDetailPage;
-import io.onedev.server.web.page.project.pullrequests.detail.changes.PullRequestChangesPage;
-import io.onedev.server.web.page.project.pullrequests.detail.mergepreview.MergePreviewPage;
-
-@SuppressWarnings("serial")
-public class TextDiffPanel extends Panel implements SourceAware {
-
- private final IModel<Project> projectModel;
-
- private final IModel<PullRequest> requestModel;
-
- private final BlobChange change;
-
- private final Map<Integer, Integer> contextSizes = new HashMap<>();
-
- private final DiffViewMode diffMode;
-
- private final IModel<Boolean> blameModel;
-
- private final BlobCommentSupport commentSupport;
-
- private final List<MarkPos> initialMarks;
-
- private Component symbolTooltip;
-
- private AbstractPostAjaxBehavior callbackBehavior;
-
- private BlameMessageBehavior blameMessageBehavior;
-
- private transient List<MarkAwareDiffBlock> diffBlocks;
-
- private BlameInfo blameInfo;
-
- public TextDiffPanel(String id, IModel<Project> projectModel, IModel<PullRequest> requestModel,
- BlobChange change, DiffViewMode diffMode, @Nullable IModel<Boolean> blameModel,
- @Nullable BlobCommentSupport commentSupport) {
- super(id);
-
- this.projectModel = projectModel;
- this.requestModel = requestModel;
- this.change = change;
- this.diffMode = diffMode;
- this.commentSupport = commentSupport;
- this.blameModel = blameModel;
-
- if (blameModel != null && blameModel.getObject()) {
- blameInfo = getBlameInfo();
- }
-
- initialMarks = new ArrayList<>();
- if (commentSupport != null) {
- MarkPos mark = commentSupport.getMark();
- if (mark != null) {
- initialMarks.add(mark);
- }
- for (CodeComment comment: commentSupport.getComments()) {
- mark = comment.getMarkPos();
- initialMarks.add(mark);
- }
- }
- }
-
- private String getJson(MarkPos mark) {
- try {
- MarkInfo markInfo = new MarkInfo(mark, getOldCommit().name());
- return OneDev.getInstance(ObjectMapper.class).writeValueAsString(markInfo);
- } catch (JsonProcessingException e) {
- throw new RuntimeException(e);
- }
- }
-
- private BlameInfo getBlameInfo() {
- blameInfo = new BlameInfo();
- BlameCommand cmd = new BlameCommand(projectModel.getObject().getGitDir());
- String oldPath = change.getOldBlobIdent().path;
- if (oldPath != null) {
- cmd.commitHash(getOldCommit().name()).file(oldPath);
- for (BlameBlock blame: cmd.call()) {
- for (LinearRange range: blame.getRanges()) {
- for (int i=range.getFrom(); i<=range.getTo(); i++)
- blameInfo.oldBlame.put(i, blame.getCommit());
- }
- }
- }
- String newPath = change.getNewBlobIdent().path;
- if (newPath != null) {
- cmd.commitHash(getNewCommit().name()).file(newPath);
- for (BlameBlock blame: cmd.call()) {
- for (LinearRange range: blame.getRanges()) {
- for (int i=range.getFrom(); i<=range.getTo(); i++)
- blameInfo.newBlame.put(i, blame.getCommit());
- }
- }
- }
- return blameInfo;
- }
-
- private WebMarkupContainer newActions() {
- WebMarkupContainer actions = new WebMarkupContainer("actions");
-
- actions.add(new AjaxLink<Void>("blameFile") {
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setVisible(blameModel != null);
- }
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- if (blameInfo != null) {
- blameInfo = null;
- } else {
- blameInfo = getBlameInfo();
- }
- target.add(TextDiffPanel.this);
- blameModel.setObject(blameInfo != null);
- }
-
- }.add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {
-
- @Override
- public String getObject() {
- return blameInfo!=null? "active": "";
- }
-
- })).setOutputMarkupId(true));
-
- Project project = projectModel.getObject();
- PullRequest request = requestModel.getObject();
- ProjectBlobPage.State viewState = new ProjectBlobPage.State(change.getBlobIdent());
-
- viewState.requestId = PullRequest.idOf(request);
- PageParameters params = ProjectBlobPage.paramsOf(project, viewState);
- actions.add(new ViewStateAwarePageLink<Void>("viewFile", ProjectBlobPage.class, params));
-
- if (change.getType() != ChangeType.DELETE) {
- if (request != null
- && request.getSource() != null
- && request.getSource().getObjectName(false) != null
- && SecurityUtils.canModify(request.getSourceProject(), request.getSourceBranch(), change.getPath())
- && (getPage() instanceof PullRequestChangesPage || getPage() instanceof MergePreviewPage)) {
- // we are in context of a pull request and pull request source branch exists, so we edit in source branch instead
- Link<Void> editLink = new Link<Void>("editFile") {
-
- @Override
- public void onClick() {
- BlobIdent blobIdent = new BlobIdent(request.getSourceBranch(), change.getPath(),
- FileMode.REGULAR_FILE.getBits());
- ProjectBlobPage.State editState = new ProjectBlobPage.State(blobIdent);
- editState.requestId = request.getId();
- editState.mode = Mode.EDIT;
- PageParameters params = ProjectBlobPage.paramsOf(request.getSourceProject(), editState);
- setResponsePage(ProjectBlobPage.class, params);
- }
-
- };
- editLink.add(AttributeAppender.append("title", "Edit on source branch"));
- actions.add(editLink);
- } else if (SecurityUtils.canModify(project, change.getBlobIdent().revision, change.getPath())
- && project.getBranchRef(change.getBlobIdent().revision) != null) {
- // we are on a branch
- Link<Void> editLink = new Link<Void>("editFile") {
-
- @Override
- public void onClick() {
- ProjectBlobPage.State editState = new ProjectBlobPage.State(change.getBlobIdent());
- editState.mode = Mode.EDIT;
- PageParameters params = ProjectBlobPage.paramsOf(project, editState);
- setResponsePage(ProjectBlobPage.class, params);
- }
-
- };
- editLink.add(AttributeAppender.append("title", "Edit on branch " + change.getBlobIdent().revision));
- actions.add(editLink);
- } else {
- actions.add(new WebMarkupContainer("editFile").setVisible(false));
- }
- } else {
- actions.add(new WebMarkupContainer("editFile").setVisible(false));
- }
-
- return actions;
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- add(new DiffStatBar("diffStat", change.getAdditions(), change.getDeletions(), true));
- add(new BlobDiffTitle("title", change));
-
- add(newActions());
-
- add(new Label("diffLines", new LoadableDetachableModel<String>() {
-
- @Override
- protected String load() {
- return renderDiffs();
- }
-
- }).setEscapeModelStrings(false));
-
- add(callbackBehavior = new AbstractPostAjaxBehavior() {
-
- private String getMarkedText(MarkPos mark) {
- List<String> lines;
- if (mark.getCommit().equals(getOldCommit().name()))
- lines = change.getOldText().getLines();
- else
- lines = change.getNewText().getLines();
- StringBuilder builder = new StringBuilder();
- if (mark.getRange().getFromRow() != mark.getRange().getToRow()) {
- String line = lines.get(mark.getRange().getFromRow());
- int beginChar = mark.getRange().getFromColumn();
- if (beginChar < line.length())
- builder.append(line.substring(beginChar));
- for (int i=mark.getRange().getFromRow()+1; i<mark.getRange().getToRow(); i++) {
- if (builder.length() != 0)
- builder.append("\n");
- builder.append(lines.get(i));
- }
- line = lines.get(mark.getRange().getToRow());
- int endChar = mark.getRange().getToColumn();
- if (endChar > 0) {
- if (endChar > line.length())
- endChar = line.length();
- if (builder.length() != 0)
- builder.append("\n");
- builder.append(line.substring(0, endChar));
- }
- } else {
- String line = lines.get(mark.getRange().getFromRow());
- int beginChar = mark.getRange().getFromColumn();
- int endChar = mark.getRange().getToColumn();
- if (beginChar < line.length() && endChar > 0) {
- if (endChar > line.length())
- endChar = line.length();
- builder.append(line.substring(beginChar, endChar));
- }
- }
-
- return builder.toString();
- }
-
- @Override
- protected void respond(AjaxRequestTarget target) {
- IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();
- switch (params.getParameterValue("action").toString()) {
- case "expand":
- if (blameInfo != null) {
- blameInfo.lastCommitHash = null;
- blameInfo.lastOldCommitHash = null;
- blameInfo.lastNewCommitHash = null;
- }
- int index = params.getParameterValue("param1").toInt();
- Integer lastContextSize = contextSizes.get(index);
- if (lastContextSize == null)
- lastContextSize = WebConstants.DIFF_CONTEXT_SIZE;
- int contextSize = lastContextSize + WebConstants.DIFF_EXPAND_SIZE;
- contextSizes.put(index, contextSize);
-
- StringBuilder builder = new StringBuilder();
- appendEquals(builder, index, lastContextSize, contextSize);
-
- String expanded = StringUtils.replace(builder.toString(), "\"", "\\\"");
- expanded = StringUtils.replace(expanded, "\n", "");
- String script = String.format("onedev.server.textDiff.expand('%s', %d, \"%s\");",
- getMarkupId(), index, expanded);
- target.appendJavaScript(script);
- break;
- case "openSelectionPopover":
- String jsonOfPosition = String.format("{left: %d, top: %d}",
- params.getParameterValue("param1").toInt(),
- params.getParameterValue("param2").toInt());
- MarkPos mark = getMark(params, "param3", "param4", "param5", "param6", "param7");
- script = String.format("onedev.server.textDiff.openSelectionPopover('%s', %s, %s, '%s', '%s', %s);",
- getMarkupId(), jsonOfPosition, getJson(mark), commentSupport.getMarkUrl(mark),
- JavaScriptEscape.escapeJavaScript(getMarkedText(mark)),
- SecurityUtils.getUser()!=null);
- target.appendJavaScript(script);
- break;
- case "addComment":
- Preconditions.checkNotNull(SecurityUtils.getUser());
-
- mark = getMark(params, "param1", "param2", "param3", "param4", "param5");
- commentSupport.onAddComment(target, mark);
- script = String.format("onedev.server.textDiff.onAddComment($('#%s'), %s);",
- getMarkupId(), getJson(mark));
- target.appendJavaScript(script);
- break;
- case "toggleComment":
- Long commentId = params.getParameterValue("param1").toLong();
- CodeComment comment = OneDev.getInstance(CodeCommentManager.class).load(commentId);
- CodeComment prevComment = commentSupport.getOpenComment();
- commentSupport.onToggleComment(target, comment);
- if (!comment.equals(prevComment)) {
- script = String.format("onedev.server.textDiff.onOpenComment($('#%s'), %s);",
- getMarkupId(), getJsonOfComment(comment));
- target.appendJavaScript(script);
- } else {
- onCommentClosed(target, comment);
- }
- break;
- }
- }
-
- });
-
- add(blameMessageBehavior = new BlameMessageBehavior() {
-
- @Override
- protected Project getProject() {
- return projectModel.getObject();
- }
- });
-
- symbolTooltip = new SymbolTooltipPanel("symbolTooltip", projectModel) {
-
- @Override
- protected void onSelect(AjaxRequestTarget target, QueryHit hit) {
- setResponsePage(ProjectBlobPage.class, getQueryHitParams(hit));
- }
-
- @Override
- protected void onOccurrencesQueried(AjaxRequestTarget target, List<QueryHit> hits) {
- setResponsePage(ProjectBlobPage.class, getFindOccurrencesParams());
- }
-
- @Override
- protected String getBlobPath() {
- if (getRevision().equals(change.getNewBlobIdent().revision))
- return change.getNewBlobIdent().path;
- else
- return change.getOldBlobIdent().path;
- }
-
- };
- add(symbolTooltip);
-
- setOutputMarkupId(true);
- }
-
- private MarkPos getMark(IRequestParameters params, String leftSideParam,
- String beginLineParam, String beginCharParam,
- String endLineParam, String endCharParam) {
- boolean leftSide = params.getParameterValue(leftSideParam).toBoolean();
- int beginLine = params.getParameterValue(beginLineParam).toInt();
- int beginChar = params.getParameterValue(beginCharParam).toInt();
- int endLine = params.getParameterValue(endLineParam).toInt();
- int endChar = params.getParameterValue(endCharParam).toInt();
- String commit = leftSide?getOldCommit().name():getNewCommit().name();
- return new MarkPos(commit, change.getPath(), new PlanarRange(beginLine, beginChar, endLine, endChar));
- }
-
- private void appendEquals(StringBuilder builder, int index, int lastContextSize, int contextSize) {
- MarkAwareDiffBlock block = getDiffBlocks().get(index);
- if (index == 0) {
- int start = block.getLines().size()-contextSize;
- if (start < 0)
- start=0;
- else if (start > 0)
- appendExpander(builder, index, start);
- for (int j=start; j<block.getLines().size()-lastContextSize; j++)
- appendEqual(builder, block, j, lastContextSize);
- } else if (index == getDiffBlocks().size()-1) {
- int end = block.getLines().size();
- int skipped = 0;
- if (end > contextSize) {
- skipped = end-contextSize;
- end = contextSize;
- }
- for (int j=lastContextSize; j<end; j++)
- appendEqual(builder, block, j, lastContextSize);
- if (skipped != 0)
- appendExpander(builder, index, skipped);
- } else if (2*contextSize < block.getLines().size()) {
- for (int j=lastContextSize; j<contextSize; j++)
- appendEqual(builder, block, j, lastContextSize);
- appendExpander(builder, index, block.getLines().size() - 2*contextSize);
- for (int j=block.getLines().size()-contextSize; j<block.getLines().size()-lastContextSize; j++)
- appendEqual(builder, block, j, lastContextSize);
- } else {
- for (int j=lastContextSize; j<block.getLines().size()-lastContextSize; j++)
- appendEqual(builder, block, j, lastContextSize);
- }
- }
-
- private void appendMarkedEquals(StringBuilder builder, int index) {
- MarkAwareDiffBlock block = getDiffBlocks().get(index);
- for (int i=0; i<block.getLines().size(); i++)
- appendEqual(builder, block, i, 0);
- }
-
- private ObjectId getOldCommit() {
- String oldRev = change.getOldBlobIdent().revision;
- if (oldRev.equals(ObjectId.zeroId().name().toString())) {
- return ObjectId.zeroId();
- } else {
- return projectModel.getObject().getRevCommit(oldRev, true);
- }
- }
-
- private ObjectId getNewCommit() {
- String newRev = change.getNewBlobIdent().revision;
- if (newRev.equals(ObjectId.zeroId().name().toString())) {
- return ObjectId.zeroId();
- } else {
- return projectModel.getObject().getRevCommit(newRev, true);
- }
- }
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
-
- response.render(JavaScriptHeaderItem.forReference(new TextDiffResourceReference()));
-
- String jsonOfOldCommentInfos;
- String jsonOfNewCommentInfos;
- String jsonOfMark;
- String jsonOfCommentInfo;
- String dirtyContainerId;
- if (commentSupport != null) {
- String oldCommitHash = getOldCommit().name();
- Map<Integer, List<CommentInfo>> oldCommentInfos = new HashMap<>();
- Map<Integer, List<CommentInfo>> newCommentInfos = new HashMap<>();
- for (CodeComment comment: commentSupport.getComments()) {
- if (comment.getMarkPos().getRange() != null) {
- int line = comment.getMarkPos().getRange().getFromRow();
- List<CommentInfo> commentInfosAtLine;
- CommentInfo commentInfo = new CommentInfo();
- commentInfo.id = comment.getId();
- commentInfo.mark = new MarkInfo(comment, oldCommitHash);
- if (commentInfo.mark.leftSide) {
- commentInfosAtLine = oldCommentInfos.get(line);
- if (commentInfosAtLine == null) {
- commentInfosAtLine = new ArrayList<>();
- oldCommentInfos.put(line, commentInfosAtLine);
- }
- } else {
- commentInfosAtLine = newCommentInfos.get(line);
- if (commentInfosAtLine == null) {
- commentInfosAtLine = new ArrayList<>();
- newCommentInfos.put(line, commentInfosAtLine);
- }
- }
- commentInfosAtLine.add(commentInfo);
- }
- }
- for (List<CommentInfo> value: oldCommentInfos.values()) {
- value.sort((o1, o2)->(int)(o1.id-o2.id));
- }
- for (List<CommentInfo> value: newCommentInfos.values()) {
- value.sort((o1, o2)->(int)(o1.id-o2.id));
- }
-
- ObjectMapper mapper = OneDev.getInstance(ObjectMapper.class);
- try {
- jsonOfOldCommentInfos = mapper.writeValueAsString(oldCommentInfos);
- jsonOfNewCommentInfos = mapper.writeValueAsString(newCommentInfos);
- } catch (JsonProcessingException e) {
- throw new RuntimeException(e);
- }
-
- MarkPos mark = commentSupport.getMark();
- if (mark != null) {
- jsonOfMark = getJson(mark);
- } else {
- jsonOfMark = "undefined";
- }
- CodeComment comment = commentSupport.getOpenComment();
- if (comment != null) {
- jsonOfCommentInfo = getJsonOfComment(comment);
- } else {
- jsonOfCommentInfo = "undefined";
- }
- dirtyContainerId = "'" + commentSupport.getDirtyContainer().getMarkupId() + "'";
- } else {
- jsonOfMark = "undefined";
- jsonOfCommentInfo = "undefined";
- jsonOfOldCommentInfos = "undefined";
- jsonOfNewCommentInfos = "undefined";
- dirtyContainerId = "undefined";
- }
-
- CharSequence callback = callbackBehavior.getCallbackFunction(
- explicit("action"), explicit("param1"), explicit("param2"),
- explicit("param3"), explicit("param4"), explicit("param5"),
- explicit("param6"), explicit("param7"), explicit("param8"));
-
- String unableCommentMessage;
- if (getPage() instanceof MergePreviewPage) {
- unableCommentMessage = "Unable to comment on merge preview";
- } else {
- unableCommentMessage = "Unable to comment at this place";
- }
- String script = String.format("onedev.server.textDiff.onDomReady('%s', '%s', '%s', '%s', %s, %s, %s, '%s', %s,"
- + "%s, %s, %s, %s, '%s');", getMarkupId(), symbolTooltip.getMarkupId(),
- change.getOldBlobIdent().revision, change.getNewBlobIdent().revision,
- callback, blameMessageBehavior.getCallback(),
- commentSupport!=null, unableCommentMessage, jsonOfMark, jsonOfCommentInfo,
- jsonOfOldCommentInfos, jsonOfNewCommentInfos, dirtyContainerId,
- OneDev.getInstance().getDocRoot());
-
- response.render(OnDomReadyHeaderItem.forScript(script));
-
- script = String.format("onedev.server.textDiff.onWindowLoad('%s', %b, %s);",
- getMarkupId(), RequestCycle.get().find(AjaxRequestTarget.class) != null, jsonOfMark);
- response.render(OnLoadHeaderItem.forScript(script));
- }
-
- private String renderDiffs() {
- StringBuilder builder = new StringBuilder();
- if (blameInfo != null) {
- blameInfo.lastCommitHash = null;
- blameInfo.lastOldCommitHash = null;
- blameInfo.lastNewCommitHash = null;
- }
-
- if (diffMode == DiffViewMode.UNIFIED) {
- if (blameInfo != null) {
- builder.append(""
- + "<colgroup>"
- + "<col width='240'></col>"
- + "<col width='60'></col>"
- + "<col width='60'></col>"
- + "<col width='15'></col>"
- + "<col></col>"
- + "</colgroup>");
- } else {
- builder.append(""
- + "<colgroup>"
- + "<col width='60'></col>"
- + "<col width='60'></col>"
- + "<col width='15'></col>"
- + "<col></col>"
- + "</colgroup>");
- }
- } else {
- if (blameInfo != null) {
- builder.append(""
- + "<colgroup>"
- + "<col width='70'></col>"
- + "<col width='60'></col>"
- + "<col width='15'></col>"
- + "<col></col>"
- + "<col width='70'></col>"
- + "<col width='60'></col>"
- + "<col width='15'></col>"
- + "<col></col>"
- + "</colgroup>");
- } else {
- builder.append(""
- + "<colgroup>"
- + "<col width='60'></col>"
- + "<col width='15'></col>"
- + "<col></col>"
- + "<col width='60'></col>"
- + "<col width='15'></col>"
- + "<col></col>"
- + "</colgroup>");
- }
- }
- for (int i=0; i<getDiffBlocks().size(); i++) {
- MarkAwareDiffBlock block = getDiffBlocks().get(i);
- if (block.getType() == Type.EQUAL) {
- Integer lastContextSize = contextSizes.get(i);
- if (lastContextSize == null)
- lastContextSize = WebConstants.DIFF_CONTEXT_SIZE;
- appendEquals(builder, i, 0, lastContextSize);
- } else if (block.getType() == Type.MARKED_EQUAL) {
- appendMarkedEquals(builder, i);
- } else if (block.getType () == Type.DELETE) {
- if (i+1<getDiffBlocks().size()) {
- MarkAwareDiffBlock nextBlock = getDiffBlocks().get(i+1);
- if (nextBlock.getType() == Type.INSERT) {
- LinkedHashMap<Integer, LineDiff> lineChanges =
- DiffUtils.align(block.getLines(), nextBlock.getLines(), false);
- if (blameInfo != null && diffMode == DiffViewMode.UNIFIED) {
- for (int j=0; j<block.getLines().size(); j++) {
- LineDiff lineDiff = lineChanges.get(j);
- if (lineDiff != null) {
- appendDelete(builder, block, j, lineDiff.getTokenDiffs());
- } else {
- appendDelete(builder, block, j, null);
- }
- }
- Map<Integer, LineDiff> lineChangesByInsert = new HashMap<>();
- for (LineDiff diff: lineChanges.values()) {
- lineChangesByInsert.put(diff.getCompareLine(), diff);
- }
- for (int j=0; j<nextBlock.getLines().size(); j++) {
- LineDiff lineDiff = lineChangesByInsert.get(j);
- if (lineDiff != null) {
- appendInsert(builder, nextBlock, j, lineDiff.getTokenDiffs());
- } else {
- appendInsert(builder, nextBlock, j, null);
- }
- }
- } else {
- int prevDeleteLineIndex = 0;
- int prevInsertLineIndex = 0;
- for (Map.Entry<Integer, LineDiff> entry: lineChanges.entrySet()) {
- int deleteLineIndex = entry.getKey();
- LineDiff lineChange = entry.getValue();
- int insertLineIndex = lineChange.getCompareLine();
-
- appendDeletesAndInserts(builder, block, nextBlock, prevDeleteLineIndex, deleteLineIndex,
- prevInsertLineIndex, insertLineIndex);
-
- appendModification(builder, block, nextBlock, deleteLineIndex, insertLineIndex,
- lineChange.getTokenDiffs());
-
- prevDeleteLineIndex = deleteLineIndex+1;
- prevInsertLineIndex = insertLineIndex+1;
- }
- appendDeletesAndInserts(builder, block, nextBlock,
- prevDeleteLineIndex, block.getLines().size(),
- prevInsertLineIndex, nextBlock.getLines().size());
- }
- i++;
- } else {
- for (int j=0; j<block.getLines().size(); j++)
- appendDelete(builder, block, j, null);
- }
- } else {
- for (int j=0; j<block.getLines().size(); j++)
- appendDelete(builder, block, j, null);
- }
- } else {
- for (int j=0; j<block.getLines().size(); j++)
- appendInsert(builder, block, j, null);
- }
- }
- return builder.toString();
- }
-
- private void appendDeletesAndInserts(StringBuilder builder, MarkAwareDiffBlock deleteBlock,
- MarkAwareDiffBlock insertBlock, int fromDeleteLineIndex, int toDeleteLineIndex,
- int fromInsertLineIndex, int toInsertLineIndex) {
- if (diffMode == DiffViewMode.UNIFIED) {
- for (int i=fromDeleteLineIndex; i<toDeleteLineIndex; i++)
- appendDelete(builder, deleteBlock, i, null);
- for (int i=fromInsertLineIndex; i<toInsertLineIndex; i++)
- appendInsert(builder, insertBlock, i, null);
- } else {
- int deleteSize = toDeleteLineIndex - fromDeleteLineIndex;
- int insertSize = toInsertLineIndex - fromInsertLineIndex;
- if (deleteSize < insertSize) {
- for (int i=fromDeleteLineIndex; i<toDeleteLineIndex; i++)
- appendSideBySide(builder, deleteBlock, insertBlock, i, i-fromDeleteLineIndex+fromInsertLineIndex);
- for (int i=fromInsertLineIndex+deleteSize; i<toInsertLineIndex; i++)
- appendInsert(builder, insertBlock, i, null);
- } else {
- for (int i=fromInsertLineIndex; i<toInsertLineIndex; i++)
- appendSideBySide(builder, deleteBlock, insertBlock, i-fromInsertLineIndex+fromDeleteLineIndex, i);
- for (int i=fromDeleteLineIndex+insertSize; i<toDeleteLineIndex; i++)
- appendDelete(builder, deleteBlock, i, null);
- }
- }
- }
-
- private void appendBlame(StringBuilder builder, int oldLineNo, int newLineNo) {
- BlameCommit commit;
- if (newLineNo != -1)
- commit = Preconditions.checkNotNull(blameInfo.newBlame.get(newLineNo));
- else
- commit = Preconditions.checkNotNull(blameInfo.oldBlame.get(oldLineNo));
- if (diffMode == DiffViewMode.UNIFIED && !commit.getHash().equals(blameInfo.lastCommitHash)
- || diffMode == DiffViewMode.SPLIT && newLineNo != -1 && !commit.getHash().equals(blameInfo.lastNewCommitHash)
- || diffMode == DiffViewMode.SPLIT && oldLineNo != -1 && !commit.getHash().equals(blameInfo.lastOldCommitHash)) {
- CommitDetailPage.State state = new CommitDetailPage.State();
- state.revision = commit.getHash();
- state.whitespaceOption = change.getWhitespaceOption();
- PageParameters params = CommitDetailPage.paramsOf(projectModel.getObject(), state);
- String url = urlFor(CommitDetailPage.class, params).toString();
- if (diffMode == DiffViewMode.UNIFIED) {
- builder.append(String.format("<td class='blame noselect'><a class='hash' href='%s' data-hash='%s'>%s</a><span class='date'>%s</span><span class='author'>%s</span></td>",
- url, commit.getHash(), GitUtils.abbreviateSHA(commit.getHash()),
- DateUtils.formatDate(commit.getCommitter().getWhen()),
- HtmlEscape.escapeHtml5(commit.getAuthor().getName())));
- } else {
- builder.append(String.format("<td class='abbr blame noselect'><a class='hash' href='%s' data-hash='%s'>%s</a></td>",
- url, commit.getHash(), GitUtils.abbreviateSHA(commit.getHash())));
- }
- } else {
- if (diffMode == DiffViewMode.UNIFIED) {
- builder.append("<td class='blame noselect'><div class='same-as-above'>...</div></td>");
- } else {
- builder.append("<td class='abbr blame noselect'><div class='same-as-above'>...</div></td>");
- }
- }
- blameInfo.lastCommitHash = commit.getHash();
- if (newLineNo != -1)
- blameInfo.lastNewCommitHash = commit.getHash();
- if (oldLineNo != -1)
- blameInfo.lastOldCommitHash = commit.getHash();
- }
-
- private String getOperationClass(Operation operation) {
- if (operation == Operation.INSERT)
- return "insert";
- else if (operation == Operation.DELETE)
- return "delete";
- else
- return null;
- }
-
- private void appendTokenized(StringBuilder builder, Tokenized tokenized) {
- if (tokenized.getTokens().length == 0) {
- builder.append("&nbsp;");
- } else {
- for (long token: tokenized.getTokens()) {
- builder.append(TokenUtils.toHtml(tokenized.getText(), token, null, null));
- }
- }
- }
-
- private void appendEqual(StringBuilder builder, MarkAwareDiffBlock block, int lineIndex, int lastContextSize) {
- if (lastContextSize != 0)
- builder.append("<tr class='code expanded'>");
- else
- builder.append("<tr class='code original'>");
-
- int oldLineNo = block.getOldStart() + lineIndex;
- int newLineNo = block.getNewStart() + lineIndex;
-
- if (diffMode == DiffViewMode.UNIFIED) {
- if (blameInfo != null) {
- appendBlame(builder, oldLineNo, newLineNo);
- }
- builder.append("<td class='number noselect'>").append(oldLineNo+1).append("</td>");
- builder.append("<td class='number noselect'>").append(newLineNo+1).append("</td>");
- builder.append("<td class='operation noselect'>&nbsp;</td>");
- builder.append("<td class='content' data-old='").append(oldLineNo).append("' data-new='").append(newLineNo).append("'>");
- appendTokenized(builder, block.getLines().get(lineIndex));
- builder.append("</td>");
- } else {
- if (blameInfo != null) {
- appendBlame(builder, oldLineNo, -1);
- }
- builder.append("<td class='number noselect'>").append(oldLineNo+1).append("</td>");
- builder.append("<td class='operation noselect'>&nbsp;</td>");
- builder.append("<td class='content left' data-old='").append(oldLineNo).append("' data-new='").append(newLineNo).append("'>");
- appendTokenized(builder, block.getLines().get(lineIndex));
- builder.append("</td>");
- if (blameInfo != null) {
- appendBlame(builder, -1, newLineNo);
- }
- builder.append("<td class='number noselect'>").append(newLineNo+1).append("</td>");
- builder.append("<td class='operation noselect'>&nbsp;</td>");
- builder.append("<td class='content right' data-old='").append(oldLineNo).append("' data-new='").append(newLineNo).append("'>");
- appendTokenized(builder, block.getLines().get(lineIndex));
- builder.append("</td>");
- }
- builder.append("</tr>");
- }
-
- private void appendInsert(StringBuilder builder, MarkAwareDiffBlock block, int lineIndex,
- @Nullable List<DiffBlock<TextToken>> tokenDiffs) {
- builder.append("<tr class='code original'>");
-
- int newLineNo = block.getNewStart() + lineIndex;
- if (diffMode == DiffViewMode.UNIFIED) {
- if (blameInfo != null) {
- appendBlame(builder, -1, newLineNo);
- }
- builder.append("<td class='number noselect new'>&nbsp;</td>");
- builder.append("<td class='number noselect new'>").append(newLineNo+1).append("</td>");
- builder.append("<td class='operation noselect new'>+</td>");
- builder.append("<td class='content new' data-new='").append(newLineNo).append("'>");
- if (tokenDiffs != null) {
- if (tokenDiffs.isEmpty()) {
- builder.append("&nbsp;");
- } else {
- for (DiffBlock<TextToken> tokenBlock: tokenDiffs) {
- for (TextToken token: tokenBlock.getUnits()) {
- if (tokenBlock.getOperation() != Operation.DELETE)
- builder.append(TokenUtils.toHtml(token, getOperationClass(tokenBlock.getOperation()), null));
- }
- }
- }
- } else {
- appendTokenized(builder, block.getLines().get(lineIndex));
- }
- builder.append("</td>");
- } else {
- if (blameInfo != null) {
- builder.append("<td class='blame noselect'>&nbsp;</td>");
- }
- builder.append("<td class='number noselect'>&nbsp;</td>");
- builder.append("<td class='operation noselect'>&nbsp;</td>");
- builder.append("<td class='content left'>&nbsp;</td>");
- if (blameInfo != null) {
- appendBlame(builder, -1, newLineNo);
- }
- builder.append("<td class='number noselect new'>").append(newLineNo+1).append("</td>");
- builder.append("<td class='operation noselect new'>+</td>");
- builder.append("<td class='content right new' data-new='").append(newLineNo).append("'>");
- appendTokenized(builder, block.getLines().get(lineIndex));
- builder.append("</td>");
- }
- builder.append("</tr>");
- }
-
- private void appendDelete(StringBuilder builder, MarkAwareDiffBlock block, int lineIndex,
- @Nullable List<DiffBlock<TextToken>> tokenDiffs) {
- builder.append("<tr class='code original'>");
-
- int oldLineNo = block.getOldStart() + lineIndex;
- if (diffMode == DiffViewMode.UNIFIED ) {
- if (blameInfo != null) {
- appendBlame(builder, oldLineNo, -1);
- }
- builder.append("<td class='number noselect old'>").append(oldLineNo+1).append("</td>");
- builder.append("<td class='number noselect old'>&nbsp;</td>");
- builder.append("<td class='operation noselect old'>-</td>");
- builder.append("<td class='content old' data-old='").append(oldLineNo).append("'>");
- if (tokenDiffs != null) {
- if (tokenDiffs.isEmpty()) {
- builder.append("&nbsp;");
- } else {
- for (DiffBlock<TextToken> tokenBlock: tokenDiffs) {
- for (TextToken token: tokenBlock.getUnits()) {
- if (tokenBlock.getOperation() != Operation.INSERT)
- builder.append(TokenUtils.toHtml(token, getOperationClass(tokenBlock.getOperation()), null));
- }
- }
- }
- } else {
- appendTokenized(builder, block.getLines().get(lineIndex));
- }
- builder.append("</td>");
- } else {
- if (blameInfo != null) {
- appendBlame(builder, oldLineNo, -1);
- }
- builder.append("<td class='number noselect old'>").append(oldLineNo+1).append("</td>");
- builder.append("<td class='operation noselect old'>-</td>");
- builder.append("<td class='content left old' data-old='").append(oldLineNo).append("'>");
- appendTokenized(builder, block.getLines().get(lineIndex));
- builder.append("</td>");
- if (blameInfo != null) {
- builder.append("<td class='blame noselect'>&nbsp;</td>");
- }
- builder.append("<td class='number noselect'>&nbsp;</td>");
- builder.append("<td class='operation noselect'>&nbsp;</td>");
- builder.append("<td class='content right'>&nbsp;</td>");
- }
- builder.append("</tr>");
- }
-
- private void appendSideBySide(StringBuilder builder, MarkAwareDiffBlock deleteBlock,
- MarkAwareDiffBlock insertBlock, int deleteLineIndex, int insertLineIndex) {
- builder.append("<tr class='code original'>");
-
- int oldLineNo = deleteBlock.getOldStart()+deleteLineIndex;
- if (blameInfo != null) {
- appendBlame(builder, oldLineNo, -1);
- }
- builder.append("<td class='number noselect old'>").append(oldLineNo+1).append("</td>");
- builder.append("<td class='operation noselect old'>-</td>");
- builder.append("<td class='content left old' data-old='").append(oldLineNo).append("'>");
- appendTokenized(builder, deleteBlock.getLines().get(deleteLineIndex));
- builder.append("</td>");
-
- int newLineNo = insertBlock.getNewStart()+insertLineIndex;
- if (blameInfo != null) {
- appendBlame(builder, -1, newLineNo);
- }
- builder.append("<td class='number noselect new'>").append(newLineNo+1).append("</td>");
- builder.append("<td class='operation noselect new'>+</td>");
- builder.append("<td class='content right new' data-new='").append(newLineNo).append("'>");
- appendTokenized(builder, insertBlock.getLines().get(insertLineIndex));
- builder.append("</td>");
-
- builder.append("</tr>");
- }
-
- private void appendModification(StringBuilder builder, MarkAwareDiffBlock deleteBlock,
- MarkAwareDiffBlock insertBlock, int deleteLineIndex, int insertLineIndex,
- List<DiffBlock<TextToken>> tokenDiffs) {
- builder.append("<tr class='code original'>");
-
- int oldLineNo = deleteBlock.getOldStart() + deleteLineIndex;
- int newLineNo = insertBlock.getNewStart() + insertLineIndex;
- if (diffMode == DiffViewMode.UNIFIED) {
- if (blameInfo != null) {
- appendBlame(builder, oldLineNo, newLineNo);
- }
- builder.append("<td class='number noselect old new'>").append(oldLineNo+1).append("</td>");
- builder.append("<td class='number noselect old new'>").append(newLineNo+1).append("</td>");
- builder.append("<td class='operation noselect old new'>*</td>");
- builder.append("<td class='content old new' data-old='").append(oldLineNo).append("' data-new='").append(newLineNo).append("'>");
- if (tokenDiffs.isEmpty()) {
- builder.append("&nbsp;");
- } else {
- for (DiffBlock<TextToken> tokenBlock: tokenDiffs) {
- for (TextToken token: tokenBlock.getUnits())
- builder.append(TokenUtils.toHtml(token, getOperationClass(tokenBlock.getOperation()), null));
- }
- }
- builder.append("</td>");
- } else {
- if (blameInfo != null) {
- appendBlame(builder, oldLineNo, -1);
- }
- builder.append("<td class='number noselect old'>").append(oldLineNo+1).append("</td>");
- builder.append("<td class='operation noselect old'>-</td>");
- builder.append("<td class='content left old' data-old='").append(oldLineNo).append("'>");
- if (tokenDiffs.isEmpty()) {
- builder.append("&nbsp;");
- } else {
- for (DiffBlock<TextToken> tokenBlock: tokenDiffs) {
- for (TextToken token: tokenBlock.getUnits()) {
- if (tokenBlock.getOperation() != Operation.INSERT)
- builder.append(TokenUtils.toHtml(token, getOperationClass(tokenBlock.getOperation()), null));
- }
- }
- }
- builder.append("</td>");
-
- if (blameInfo != null) {
- appendBlame(builder, -1, newLineNo);
- }
- builder.append("<td class='number noselect new'>").append(newLineNo+1).append("</td>");
- builder.append("<td class='operation noselect new'>+</td>");
- builder.append("<td class='content right new' data-new='").append(newLineNo).append("'>");
- if (tokenDiffs.isEmpty()) {
- builder.append("&nbsp;");
- } else {
- for (DiffBlock<TextToken> tokenBlock: tokenDiffs) {
- for (TextToken token: tokenBlock.getUnits()) {
- if (tokenBlock.getOperation() != Operation.DELETE)
- builder.append(TokenUtils.toHtml(token, getOperationClass(tokenBlock.getOperation()), null));
- }
- }
- }
- builder.append("</td>");
- }
-
- builder.append("</tr>");
- }
-
- private void appendExpander(StringBuilder builder, int blockIndex, int skippedLines) {
- builder.append("<tr class='expander expander").append(blockIndex).append("'>");
-
- String script = String.format("javascript:$('#%s').data('callback')('expand', %d);", getMarkupId(), blockIndex);
- if (diffMode == DiffViewMode.UNIFIED) {
- if (blameInfo != null) {
- builder.append("<td colspan='3' class='expander noselect'><a title='Show more lines' href=\"")
- .append(script).append("\"><i class='fa fa-sort'></i></a></td>");
- blameInfo.lastCommitHash = null;
- blameInfo.lastOldCommitHash = null;
- blameInfo.lastNewCommitHash = null;
- } else {
- builder.append("<td colspan='2' class='expander noselect'><a title='Show more lines' href=\"")
- .append(script).append("\"><i class='fa fa-sort'></i></a></td>");
- }
- builder.append("<td colspan='2' class='skipped noselect'><i class='fa fa-ellipsis-h'></i> skipped ")
- .append(skippedLines).append(" lines <i class='fa fa-ellipsis-h'></i></td>");
- } else {
- if (blameInfo != null) {
- builder.append("<td colspan='2' class='expander noselect'><a title='Show more lines' href=\"").append(script)
- .append("\"><i class='fa fa-sort'></i></a></td>");
- builder.append("<td class='skipped noselect' colspan='6'><i class='fa fa-ellipsis-h'></i> skipped ")
- .append(skippedLines).append(" lines <i class='fa fa-ellipsis-h'></i></td>");
- blameInfo.lastCommitHash = null;
- blameInfo.lastOldCommitHash = null;
- blameInfo.lastNewCommitHash = null;
- } else {
- builder.append("<td class='expander noselect'><a title='Show more lines' href=\"").append(script)
- .append("\"><i class='fa fa-sort'></i></a></td>");
- builder.append("<td class='skipped noselect' colspan='5'><i class='fa fa-ellipsis-h'></i> skipped ")
- .append(skippedLines).append(" lines <i class='fa fa-ellipsis-h'></i></td>");
- }
- }
- builder.append("</tr>");
- }
-
- private List<MarkAwareDiffBlock> getDiffBlocks() {
- if (diffBlocks == null) {
- diffBlocks = new ArrayList<>();
- List<LinearRange> oldRanges = new ArrayList<>();
- List<LinearRange> newRanges = new ArrayList<>();
- if (commentSupport != null) {
- String oldCommitHash = getOldCommit().name();
- for (MarkPos each: initialMarks) {
- LinearRange range = new LinearRange(each.getRange().fromRow, each.getRange().toRow+1);
- if (each.getCommit().equals(oldCommitHash)) {
- oldRanges.add(range);
- } else {
- newRanges.add(range);
- }
- }
- }
-
- for (DiffBlock<Tokenized> diffBlock: change.getDiffBlocks()) {
- if (diffBlock.getOperation() == Operation.DELETE) {
- diffBlocks.add(new MarkAwareDiffBlock(Type.DELETE, diffBlock.getUnits(),
- diffBlock.getOldStart(), diffBlock.getNewStart()));
- } else if (diffBlock.getOperation() == Operation.INSERT) {
- diffBlocks.add(new MarkAwareDiffBlock(Type.INSERT, diffBlock.getUnits(),
- diffBlock.getOldStart(), diffBlock.getNewStart()));
- } else {
- List<LinearRange> ranges = new ArrayList<>();
- for (LinearRange range: oldRanges) {
- ranges.add(new LinearRange(range.getFrom()-diffBlock.getOldStart(), range.getTo()-diffBlock.getOldStart()));
- }
- for (LinearRange range: newRanges) {
- ranges.add(new LinearRange(range.getFrom()-diffBlock.getNewStart(), range.getTo()-diffBlock.getNewStart()));
- }
- ranges = RangeUtils.merge(ranges);
-
- int lastIndex = 0;
- for (LinearRange range: ranges) {
- int from = range.getFrom();
- int to = range.getTo();
- if (from < diffBlock.getUnits().size() && to > 0) {
- if (from < lastIndex)
- from = lastIndex;
- if (to > diffBlock.getUnits().size())
- to = diffBlock.getUnits().size();
- if (lastIndex < from) {
- List<Tokenized> lines = diffBlock.getUnits().subList(lastIndex, from);
- diffBlocks.add(new MarkAwareDiffBlock(Type.EQUAL, lines,
- diffBlock.getOldStart()+lastIndex, diffBlock.getNewStart()+lastIndex));
- }
- if (from < to) {
- List<Tokenized> lines = diffBlock.getUnits().subList(from, to);
- diffBlocks.add(new MarkAwareDiffBlock(Type.MARKED_EQUAL, lines,
- diffBlock.getOldStart()+from, diffBlock.getNewStart()+from));
- }
- lastIndex = to;
- }
- }
-
- if (lastIndex < diffBlock.getUnits().size()) {
- List<Tokenized> lines = diffBlock.getUnits().subList(lastIndex, diffBlock.getUnits().size());
- diffBlocks.add(new MarkAwareDiffBlock(Type.EQUAL, lines,
- diffBlock.getOldStart()+lastIndex, diffBlock.getNewStart()+lastIndex));
- }
- }
- }
- }
- return diffBlocks;
- }
-
- @Override
- protected void onDetach() {
- projectModel.detach();
- requestModel.detach();
-
- if (blameModel != null)
- blameModel.detach();
-
- super.onDetach();
- }
-
- private String getJsonOfComment(CodeComment comment) {
- CommentInfo commentInfo = new CommentInfo();
- commentInfo.id = comment.getId();
- commentInfo.mark = new MarkInfo(comment, getOldCommit().name());
-
- String jsonOfCommentInfo;
- try {
- jsonOfCommentInfo = OneDev.getInstance(ObjectMapper.class).writeValueAsString(commentInfo);
- } catch (JsonProcessingException e) {
- throw new RuntimeException(e);
- }
- return jsonOfCommentInfo;
- }
-
- @Override
- public void onCommentDeleted(AjaxRequestTarget target, CodeComment comment) {
- String script = String.format("onedev.server.textDiff.onCommentDeleted($('#%s'), %s);",
- getMarkupId(), getJsonOfComment(comment));
- target.appendJavaScript(script);
- mark(target, null);
- }
-
- @Override
- public void onCommentClosed(AjaxRequestTarget target, CodeComment comment) {
- String script = String.format("onedev.server.textDiff.onCloseComment($('#%s'));", getMarkupId());
- target.appendJavaScript(script);
- mark(target, null);
- }
-
- @Override
- public void onCommentAdded(AjaxRequestTarget target, CodeComment comment) {
- String script = String.format("onedev.server.textDiff.onCommentAdded($('#%s'), %s);",
- getMarkupId(), getJsonOfComment(comment));
- target.appendJavaScript(script);
- }
-
- @Override
- public void mark(AjaxRequestTarget target, MarkPos mark) {
- String script;
- if (mark != null) {
- script = String.format(""
- + "var $container = $('#%s');"
- + "var mark = %s;"
- + "onedev.server.textDiff.scrollTo($container, mark);"
- + "onedev.server.textDiff.mark($container, mark);",
- getMarkupId(), getJson(mark));
- } else {
- script = String.format(""
- + "var $container = $('#%s');"
- + "onedev.server.textDiff.clearMark($container);"
- + "$container.removeData('mark');",
- getMarkupId());
- }
- target.appendJavaScript(script);
- }
-
- @Override
- public void onUnblame(AjaxRequestTarget target) {
- blameInfo = null;
- target.add(this);
- }
-
- @SuppressWarnings("unused")
- private static class CommentInfo {
- long id;
-
- String title;
-
- MarkInfo mark;
- }
-
- @SuppressWarnings("unused")
- private static class MarkInfo extends PlanarRange {
-
- String path;
-
- boolean leftSide;
-
- public MarkInfo() {
-
- }
-
- public MarkInfo(CodeComment comment, String oldCommitHash) {
- super(comment.getMarkPos().getRange());
- path = comment.getMarkPos().getPath();
- leftSide = comment.getMarkPos().getCommit().equals(oldCommitHash);
- }
-
- public MarkInfo(MarkPos mark, String oldCommitHash) {
- super(mark.getRange());
- path = mark.getPath();
- leftSide = mark.getCommit().equals(oldCommitHash);
- }
-
- }
-
- private static class BlameInfo implements Serializable {
-
- Map<Integer, BlameCommit> oldBlame = new HashMap<>();
-
- Map<Integer, BlameCommit> newBlame = new HashMap<>();
-
- String lastCommitHash;
-
- String lastOldCommitHash;
-
- String lastNewCommitHash;
-
- }
-
-}
+package io.onedev.server.web.component.diff.blob.text;
+
+import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Nullable;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
+import org.apache.wicket.markup.head.OnLoadHeaderItem;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.model.AbstractReadOnlyModel;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.request.IRequestParameters;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.eclipse.jgit.diff.DiffEntry.ChangeType;
+import org.eclipse.jgit.lib.FileMode;
+import org.eclipse.jgit.lib.ObjectId;
+import org.unbescape.html.HtmlEscape;
+import org.unbescape.javascript.JavaScriptEscape;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.base.Preconditions;
+
+import io.onedev.commons.jsyntax.TextToken;
+import io.onedev.commons.jsyntax.TokenUtils;
+import io.onedev.commons.jsyntax.Tokenized;
+import io.onedev.commons.utils.LinearRange;
+import io.onedev.commons.utils.RangeUtils;
+import io.onedev.commons.utils.StringUtils;
+import io.onedev.commons.utils.PlanarRange;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.CodeCommentManager;
+import io.onedev.server.git.BlameBlock;
+import io.onedev.server.git.BlameCommit;
+import io.onedev.server.git.BlobChange;
+import io.onedev.server.git.BlobIdent;
+import io.onedev.server.git.GitUtils;
+import io.onedev.server.git.command.BlameCommand;
+import io.onedev.server.model.CodeComment;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.support.MarkPos;
+import io.onedev.server.search.code.hit.QueryHit;
+import io.onedev.server.util.DateUtils;
+import io.onedev.server.util.SecurityUtils;
+import io.onedev.server.util.diff.DiffBlock;
+import io.onedev.server.util.diff.DiffMatchPatch.Operation;
+import io.onedev.server.util.diff.DiffUtils;
+import io.onedev.server.util.diff.LineDiff;
+import io.onedev.server.web.WebConstants;
+import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
+import io.onedev.server.web.behavior.blamemessage.BlameMessageBehavior;
+import io.onedev.server.web.component.diff.blob.SourceAware;
+import io.onedev.server.web.component.diff.blob.text.MarkAwareDiffBlock.Type;
+import io.onedev.server.web.component.diff.diffstat.DiffStatBar;
+import io.onedev.server.web.component.diff.difftitle.BlobDiffTitle;
+import io.onedev.server.web.component.diff.revision.BlobCommentSupport;
+import io.onedev.server.web.component.diff.revision.DiffViewMode;
+import io.onedev.server.web.component.link.ViewStateAwarePageLink;
+import io.onedev.server.web.component.symboltooltip.SymbolTooltipPanel;
+import io.onedev.server.web.page.project.blob.ProjectBlobPage;
+import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;
+import io.onedev.server.web.page.project.commits.CommitDetailPage;
+import io.onedev.server.web.page.project.pullrequests.detail.changes.PullRequestChangesPage;
+import io.onedev.server.web.page.project.pullrequests.detail.mergepreview.MergePreviewPage;
+
+@SuppressWarnings("serial")
+public class TextDiffPanel extends Panel implements SourceAware {
+
+ private final IModel<Project> projectModel;
+
+ private final IModel<PullRequest> requestModel;
+
+ private final BlobChange change;
+
+ private final Map<Integer, Integer> contextSizes = new HashMap<>();
+
+ private final DiffViewMode diffMode;
+
+ private final IModel<Boolean> blameModel;
+
+ private final BlobCommentSupport commentSupport;
+
+ private final List<MarkPos> initialMarks;
+
+ private Component symbolTooltip;
+
+ private AbstractPostAjaxBehavior callbackBehavior;
+
+ private BlameMessageBehavior blameMessageBehavior;
+
+ private transient List<MarkAwareDiffBlock> diffBlocks;
+
+ private BlameInfo blameInfo;
+
+ public TextDiffPanel(String id, IModel<Project> projectModel, IModel<PullRequest> requestModel,
+ BlobChange change, DiffViewMode diffMode, @Nullable IModel<Boolean> blameModel,
+ @Nullable BlobCommentSupport commentSupport) {
+ super(id);
+
+ this.projectModel = projectModel;
+ this.requestModel = requestModel;
+ this.change = change;
+ this.diffMode = diffMode;
+ this.commentSupport = commentSupport;
+ this.blameModel = blameModel;
+
+ if (blameModel != null && blameModel.getObject()) {
+ blameInfo = getBlameInfo();
+ }
+
+ initialMarks = new ArrayList<>();
+ if (commentSupport != null) {
+ MarkPos mark = commentSupport.getMark();
+ if (mark != null) {
+ initialMarks.add(mark);
+ }
+ for (CodeComment comment: commentSupport.getComments()) {
+ mark = comment.getMarkPos();
+ initialMarks.add(mark);
+ }
+ }
+ }
+
+ private String getJson(MarkPos mark) {
+ try {
+ MarkInfo markInfo = new MarkInfo(mark, getOldCommit().name());
+ return OneDev.getInstance(ObjectMapper.class).writeValueAsString(markInfo);
+ } catch (JsonProcessingException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ private BlameInfo getBlameInfo() {
+ blameInfo = new BlameInfo();
+ BlameCommand cmd = new BlameCommand(projectModel.getObject().getGitDir());
+ String oldPath = change.getOldBlobIdent().path;
+ if (oldPath != null) {
+ cmd.commitHash(getOldCommit().name()).file(oldPath);
+ for (BlameBlock blame: cmd.call()) {
+ for (LinearRange range: blame.getRanges()) {
+ for (int i=range.getFrom(); i<=range.getTo(); i++)
+ blameInfo.oldBlame.put(i, blame.getCommit());
+ }
+ }
+ }
+ String newPath = change.getNewBlobIdent().path;
+ if (newPath != null) {
+ cmd.commitHash(getNewCommit().name()).file(newPath);
+ for (BlameBlock blame: cmd.call()) {
+ for (LinearRange range: blame.getRanges()) {
+ for (int i=range.getFrom(); i<=range.getTo(); i++)
+ blameInfo.newBlame.put(i, blame.getCommit());
+ }
+ }
+ }
+ return blameInfo;
+ }
+
+ private WebMarkupContainer newActions() {
+ WebMarkupContainer actions = new WebMarkupContainer("actions");
+
+ actions.add(new AjaxLink<Void>("blameFile") {
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(blameModel != null);
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ if (blameInfo != null) {
+ blameInfo = null;
+ } else {
+ blameInfo = getBlameInfo();
+ }
+ target.add(TextDiffPanel.this);
+ blameModel.setObject(blameInfo != null);
+ }
+
+ }.add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {
+
+ @Override
+ public String getObject() {
+ return blameInfo!=null? "active": "";
+ }
+
+ })).setOutputMarkupId(true));
+
+ Project project = projectModel.getObject();
+ PullRequest request = requestModel.getObject();
+ ProjectBlobPage.State viewState = new ProjectBlobPage.State(change.getBlobIdent());
+
+ viewState.requestId = PullRequest.idOf(request);
+ PageParameters params = ProjectBlobPage.paramsOf(project, viewState);
+ actions.add(new ViewStateAwarePageLink<Void>("viewFile", ProjectBlobPage.class, params));
+
+ if (change.getType() != ChangeType.DELETE) {
+ if (request != null
+ && request.getSource() != null
+ && request.getSource().getObjectName(false) != null
+ && SecurityUtils.canModify(request.getSourceProject(), request.getSourceBranch(), change.getPath())
+ && (getPage() instanceof PullRequestChangesPage || getPage() instanceof MergePreviewPage)) {
+ // we are in context of a pull request and pull request source branch exists, so we edit in source branch instead
+ Link<Void> editLink = new Link<Void>("editFile") {
+
+ @Override
+ public void onClick() {
+ BlobIdent blobIdent = new BlobIdent(request.getSourceBranch(), change.getPath(),
+ FileMode.REGULAR_FILE.getBits());
+ ProjectBlobPage.State editState = new ProjectBlobPage.State(blobIdent);
+ editState.requestId = request.getId();
+ editState.mode = Mode.EDIT;
+ PageParameters params = ProjectBlobPage.paramsOf(request.getSourceProject(), editState);
+ setResponsePage(ProjectBlobPage.class, params);
+ }
+
+ };
+ editLink.add(AttributeAppender.append("title", "Edit on source branch"));
+ actions.add(editLink);
+ } else if (SecurityUtils.canModify(project, change.getBlobIdent().revision, change.getPath())
+ && project.getBranchRef(change.getBlobIdent().revision) != null) {
+ // we are on a branch
+ Link<Void> editLink = new Link<Void>("editFile") {
+
+ @Override
+ public void onClick() {
+ ProjectBlobPage.State editState = new ProjectBlobPage.State(change.getBlobIdent());
+ editState.mode = Mode.EDIT;
+ PageParameters params = ProjectBlobPage.paramsOf(project, editState);
+ setResponsePage(ProjectBlobPage.class, params);
+ }
+
+ };
+ editLink.add(AttributeAppender.append("title", "Edit on branch " + change.getBlobIdent().revision));
+ actions.add(editLink);
+ } else {
+ actions.add(new WebMarkupContainer("editFile").setVisible(false));
+ }
+ } else {
+ actions.add(new WebMarkupContainer("editFile").setVisible(false));
+ }
+
+ return actions;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ add(new DiffStatBar("diffStat", change.getAdditions(), change.getDeletions(), true));
+ add(new BlobDiffTitle("title", change));
+
+ add(newActions());
+
+ add(new Label("diffLines", new LoadableDetachableModel<String>() {
+
+ @Override
+ protected String load() {
+ return renderDiffs();
+ }
+
+ }).setEscapeModelStrings(false));
+
+ add(callbackBehavior = new AbstractPostAjaxBehavior() {
+
+ private String getMarkedText(MarkPos mark) {
+ List<String> lines;
+ if (mark.getCommit().equals(getOldCommit().name()))
+ lines = change.getOldText().getLines();
+ else
+ lines = change.getNewText().getLines();
+ StringBuilder builder = new StringBuilder();
+ if (mark.getRange().getFromRow() != mark.getRange().getToRow()) {
+ String line = lines.get(mark.getRange().getFromRow());
+ int beginChar = mark.getRange().getFromColumn();
+ if (beginChar < line.length())
+ builder.append(line.substring(beginChar));
+ for (int i=mark.getRange().getFromRow()+1; i<mark.getRange().getToRow(); i++) {
+ if (builder.length() != 0)
+ builder.append("\n");
+ builder.append(lines.get(i));
+ }
+ line = lines.get(mark.getRange().getToRow());
+ int endChar = mark.getRange().getToColumn();
+ if (endChar > 0) {
+ if (endChar > line.length())
+ endChar = line.length();
+ if (builder.length() != 0)
+ builder.append("\n");
+ builder.append(line.substring(0, endChar));
+ }
+ } else {
+ String line = lines.get(mark.getRange().getFromRow());
+ int beginChar = mark.getRange().getFromColumn();
+ int endChar = mark.getRange().getToColumn();
+ if (beginChar < line.length() && endChar > 0) {
+ if (endChar > line.length())
+ endChar = line.length();
+ builder.append(line.substring(beginChar, endChar));
+ }
+ }
+
+ return builder.toString();
+ }
+
+ @Override
+ protected void respond(AjaxRequestTarget target) {
+ IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();
+ switch (params.getParameterValue("action").toString()) {
+ case "expand":
+ if (blameInfo != null) {
+ blameInfo.lastCommitHash = null;
+ blameInfo.lastOldCommitHash = null;
+ blameInfo.lastNewCommitHash = null;
+ }
+ int index = params.getParameterValue("param1").toInt();
+ Integer lastContextSize = contextSizes.get(index);
+ if (lastContextSize == null)
+ lastContextSize = WebConstants.DIFF_CONTEXT_SIZE;
+ int contextSize = lastContextSize + WebConstants.DIFF_EXPAND_SIZE;
+ contextSizes.put(index, contextSize);
+
+ StringBuilder builder = new StringBuilder();
+ appendEquals(builder, index, lastContextSize, contextSize);
+
+ String expanded = StringUtils.replace(builder.toString(), "\"", "\\\"");
+ expanded = StringUtils.replace(expanded, "\n", "");
+ String script = String.format("onedev.server.textDiff.expand('%s', %d, \"%s\");",
+ getMarkupId(), index, expanded);
+ target.appendJavaScript(script);
+ break;
+ case "openSelectionPopover":
+ String jsonOfPosition = String.format("{left: %d, top: %d}",
+ params.getParameterValue("param1").toInt(),
+ params.getParameterValue("param2").toInt());
+ MarkPos mark = getMark(params, "param3", "param4", "param5", "param6", "param7");
+ script = String.format("onedev.server.textDiff.openSelectionPopover('%s', %s, %s, '%s', '%s', %s);",
+ getMarkupId(), jsonOfPosition, getJson(mark), commentSupport.getMarkUrl(mark),
+ JavaScriptEscape.escapeJavaScript(getMarkedText(mark)),
+ SecurityUtils.getUser()!=null);
+ target.appendJavaScript(script);
+ break;
+ case "addComment":
+ Preconditions.checkNotNull(SecurityUtils.getUser());
+
+ mark = getMark(params, "param1", "param2", "param3", "param4", "param5");
+ commentSupport.onAddComment(target, mark);
+ script = String.format("onedev.server.textDiff.onAddComment($('#%s'), %s);",
+ getMarkupId(), getJson(mark));
+ target.appendJavaScript(script);
+ break;
+ case "toggleComment":
+ Long commentId = params.getParameterValue("param1").toLong();
+ CodeComment comment = OneDev.getInstance(CodeCommentManager.class).load(commentId);
+ CodeComment prevComment = commentSupport.getOpenComment();
+ commentSupport.onToggleComment(target, comment);
+ if (!comment.equals(prevComment)) {
+ script = String.format("onedev.server.textDiff.onOpenComment($('#%s'), %s);",
+ getMarkupId(), getJsonOfComment(comment));
+ target.appendJavaScript(script);
+ } else {
+ onCommentClosed(target, comment);
+ }
+ break;
+ }
+ }
+
+ });
+
+ add(blameMessageBehavior = new BlameMessageBehavior() {
+
+ @Override
+ protected Project getProject() {
+ return projectModel.getObject();
+ }
+ });
+
+ symbolTooltip = new SymbolTooltipPanel("symbolTooltip", projectModel) {
+
+ @Override
+ protected void onSelect(AjaxRequestTarget target, QueryHit hit) {
+ setResponsePage(ProjectBlobPage.class, getQueryHitParams(hit));
+ }
+
+ @Override
+ protected void onOccurrencesQueried(AjaxRequestTarget target, List<QueryHit> hits) {
+ setResponsePage(ProjectBlobPage.class, getFindOccurrencesParams());
+ }
+
+ @Override
+ protected String getBlobPath() {
+ if (getRevision().equals(change.getNewBlobIdent().revision))
+ return change.getNewBlobIdent().path;
+ else
+ return change.getOldBlobIdent().path;
+ }
+
+ };
+ add(symbolTooltip);
+
+ setOutputMarkupId(true);
+ }
+
+ private MarkPos getMark(IRequestParameters params, String leftSideParam,
+ String beginLineParam, String beginCharParam,
+ String endLineParam, String endCharParam) {
+ boolean leftSide = params.getParameterValue(leftSideParam).toBoolean();
+ int beginLine = params.getParameterValue(beginLineParam).toInt();
+ int beginChar = params.getParameterValue(beginCharParam).toInt();
+ int endLine = params.getParameterValue(endLineParam).toInt();
+ int endChar = params.getParameterValue(endCharParam).toInt();
+ String commit = leftSide?getOldCommit().name():getNewCommit().name();
+ return new MarkPos(commit, change.getPath(), new PlanarRange(beginLine, beginChar, endLine, endChar));
+ }
+
+ private void appendEquals(StringBuilder builder, int index, int lastContextSize, int contextSize) {
+ MarkAwareDiffBlock block = getDiffBlocks().get(index);
+ if (index == 0) {
+ int start = block.getLines().size()-contextSize;
+ if (start < 0)
+ start=0;
+ else if (start > 0)
+ appendExpander(builder, index, start);
+ for (int j=start; j<block.getLines().size()-lastContextSize; j++)
+ appendEqual(builder, block, j, lastContextSize);
+ } else if (index == getDiffBlocks().size()-1) {
+ int end = block.getLines().size();
+ int skipped = 0;
+ if (end > contextSize) {
+ skipped = end-contextSize;
+ end = contextSize;
+ }
+ for (int j=lastContextSize; j<end; j++)
+ appendEqual(builder, block, j, lastContextSize);
+ if (skipped != 0)
+ appendExpander(builder, index, skipped);
+ } else if (2*contextSize < block.getLines().size()) {
+ for (int j=lastContextSize; j<contextSize; j++)
+ appendEqual(builder, block, j, lastContextSize);
+ appendExpander(builder, index, block.getLines().size() - 2*contextSize);
+ for (int j=block.getLines().size()-contextSize; j<block.getLines().size()-lastContextSize; j++)
+ appendEqual(builder, block, j, lastContextSize);
+ } else {
+ for (int j=lastContextSize; j<block.getLines().size()-lastContextSize; j++)
+ appendEqual(builder, block, j, lastContextSize);
+ }
+ }
+
+ private void appendMarkedEquals(StringBuilder builder, int index) {
+ MarkAwareDiffBlock block = getDiffBlocks().get(index);
+ for (int i=0; i<block.getLines().size(); i++)
+ appendEqual(builder, block, i, 0);
+ }
+
+ private ObjectId getOldCommit() {
+ String oldRev = change.getOldBlobIdent().revision;
+ if (oldRev.equals(ObjectId.zeroId().name().toString())) {
+ return ObjectId.zeroId();
+ } else {
+ return projectModel.getObject().getRevCommit(oldRev, true);
+ }
+ }
+
+ private ObjectId getNewCommit() {
+ String newRev = change.getNewBlobIdent().revision;
+ if (newRev.equals(ObjectId.zeroId().name().toString())) {
+ return ObjectId.zeroId();
+ } else {
+ return projectModel.getObject().getRevCommit(newRev, true);
+ }
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+
+ response.render(JavaScriptHeaderItem.forReference(new TextDiffResourceReference()));
+
+ String jsonOfOldCommentInfos;
+ String jsonOfNewCommentInfos;
+ String jsonOfMark;
+ String jsonOfCommentInfo;
+ String dirtyContainerId;
+ if (commentSupport != null) {
+ String oldCommitHash = getOldCommit().name();
+ Map<Integer, List<CommentInfo>> oldCommentInfos = new HashMap<>();
+ Map<Integer, List<CommentInfo>> newCommentInfos = new HashMap<>();
+ for (CodeComment comment: commentSupport.getComments()) {
+ if (comment.getMarkPos().getRange() != null) {
+ int line = comment.getMarkPos().getRange().getFromRow();
+ List<CommentInfo> commentInfosAtLine;
+ CommentInfo commentInfo = new CommentInfo();
+ commentInfo.id = comment.getId();
+ commentInfo.mark = new MarkInfo(comment, oldCommitHash);
+ if (commentInfo.mark.leftSide) {
+ commentInfosAtLine = oldCommentInfos.get(line);
+ if (commentInfosAtLine == null) {
+ commentInfosAtLine = new ArrayList<>();
+ oldCommentInfos.put(line, commentInfosAtLine);
+ }
+ } else {
+ commentInfosAtLine = newCommentInfos.get(line);
+ if (commentInfosAtLine == null) {
+ commentInfosAtLine = new ArrayList<>();
+ newCommentInfos.put(line, commentInfosAtLine);
+ }
+ }
+ commentInfosAtLine.add(commentInfo);
+ }
+ }
+ for (List<CommentInfo> value: oldCommentInfos.values()) {
+ value.sort((o1, o2)->(int)(o1.id-o2.id));
+ }
+ for (List<CommentInfo> value: newCommentInfos.values()) {
+ value.sort((o1, o2)->(int)(o1.id-o2.id));
+ }
+
+ ObjectMapper mapper = OneDev.getInstance(ObjectMapper.class);
+ try {
+ jsonOfOldCommentInfos = mapper.writeValueAsString(oldCommentInfos);
+ jsonOfNewCommentInfos = mapper.writeValueAsString(newCommentInfos);
+ } catch (JsonProcessingException e) {
+ throw new RuntimeException(e);
+ }
+
+ MarkPos mark = commentSupport.getMark();
+ if (mark != null) {
+ jsonOfMark = getJson(mark);
+ } else {
+ jsonOfMark = "undefined";
+ }
+ CodeComment comment = commentSupport.getOpenComment();
+ if (comment != null) {
+ jsonOfCommentInfo = getJsonOfComment(comment);
+ } else {
+ jsonOfCommentInfo = "undefined";
+ }
+ dirtyContainerId = "'" + commentSupport.getDirtyContainer().getMarkupId() + "'";
+ } else {
+ jsonOfMark = "undefined";
+ jsonOfCommentInfo = "undefined";
+ jsonOfOldCommentInfos = "undefined";
+ jsonOfNewCommentInfos = "undefined";
+ dirtyContainerId = "undefined";
+ }
+
+ CharSequence callback = callbackBehavior.getCallbackFunction(
+ explicit("action"), explicit("param1"), explicit("param2"),
+ explicit("param3"), explicit("param4"), explicit("param5"),
+ explicit("param6"), explicit("param7"), explicit("param8"));
+
+ String unableCommentMessage;
+ if (getPage() instanceof MergePreviewPage) {
+ unableCommentMessage = "Unable to comment on merge preview";
+ } else {
+ unableCommentMessage = "Unable to comment at this place";
+ }
+ String script = String.format("onedev.server.textDiff.onDomReady('%s', '%s', '%s', '%s', %s, %s, %s, '%s', %s,"
+ + "%s, %s, %s, %s, '%s');", getMarkupId(), symbolTooltip.getMarkupId(),
+ change.getOldBlobIdent().revision, change.getNewBlobIdent().revision,
+ callback, blameMessageBehavior.getCallback(),
+ commentSupport!=null, unableCommentMessage, jsonOfMark, jsonOfCommentInfo,
+ jsonOfOldCommentInfos, jsonOfNewCommentInfos, dirtyContainerId,
+ OneDev.getInstance().getDocRoot());
+
+ response.render(OnDomReadyHeaderItem.forScript(script));
+
+ script = String.format("onedev.server.textDiff.onWindowLoad('%s', %b, %s);",
+ getMarkupId(), RequestCycle.get().find(AjaxRequestTarget.class) != null, jsonOfMark);
+ response.render(OnLoadHeaderItem.forScript(script));
+ }
+
+ private String renderDiffs() {
+ StringBuilder builder = new StringBuilder();
+ if (blameInfo != null) {
+ blameInfo.lastCommitHash = null;
+ blameInfo.lastOldCommitHash = null;
+ blameInfo.lastNewCommitHash = null;
+ }
+
+ if (diffMode == DiffViewMode.UNIFIED) {
+ if (blameInfo != null) {
+ builder.append(""
+ + "<colgroup>"
+ + "<col width='240'></col>"
+ + "<col width='60'></col>"
+ + "<col width='60'></col>"
+ + "<col width='15'></col>"
+ + "<col></col>"
+ + "</colgroup>");
+ } else {
+ builder.append(""
+ + "<colgroup>"
+ + "<col width='60'></col>"
+ + "<col width='60'></col>"
+ + "<col width='15'></col>"
+ + "<col></col>"
+ + "</colgroup>");
+ }
+ } else {
+ if (blameInfo != null) {
+ builder.append(""
+ + "<colgroup>"
+ + "<col width='70'></col>"
+ + "<col width='60'></col>"
+ + "<col width='15'></col>"
+ + "<col></col>"
+ + "<col width='70'></col>"
+ + "<col width='60'></col>"
+ + "<col width='15'></col>"
+ + "<col></col>"
+ + "</colgroup>");
+ } else {
+ builder.append(""
+ + "<colgroup>"
+ + "<col width='60'></col>"
+ + "<col width='15'></col>"
+ + "<col></col>"
+ + "<col width='60'></col>"
+ + "<col width='15'></col>"
+ + "<col></col>"
+ + "</colgroup>");
+ }
+ }
+ for (int i=0; i<getDiffBlocks().size(); i++) {
+ MarkAwareDiffBlock block = getDiffBlocks().get(i);
+ if (block.getType() == Type.EQUAL) {
+ Integer lastContextSize = contextSizes.get(i);
+ if (lastContextSize == null)
+ lastContextSize = WebConstants.DIFF_CONTEXT_SIZE;
+ appendEquals(builder, i, 0, lastContextSize);
+ } else if (block.getType() == Type.MARKED_EQUAL) {
+ appendMarkedEquals(builder, i);
+ } else if (block.getType () == Type.DELETE) {
+ if (i+1<getDiffBlocks().size()) {
+ MarkAwareDiffBlock nextBlock = getDiffBlocks().get(i+1);
+ if (nextBlock.getType() == Type.INSERT) {
+ LinkedHashMap<Integer, LineDiff> lineChanges =
+ DiffUtils.align(block.getLines(), nextBlock.getLines(), false);
+ if (blameInfo != null && diffMode == DiffViewMode.UNIFIED) {
+ for (int j=0; j<block.getLines().size(); j++) {
+ LineDiff lineDiff = lineChanges.get(j);
+ if (lineDiff != null) {
+ appendDelete(builder, block, j, lineDiff.getTokenDiffs());
+ } else {
+ appendDelete(builder, block, j, null);
+ }
+ }
+ Map<Integer, LineDiff> lineChangesByInsert = new HashMap<>();
+ for (LineDiff diff: lineChanges.values()) {
+ lineChangesByInsert.put(diff.getCompareLine(), diff);
+ }
+ for (int j=0; j<nextBlock.getLines().size(); j++) {
+ LineDiff lineDiff = lineChangesByInsert.get(j);
+ if (lineDiff != null) {
+ appendInsert(builder, nextBlock, j, lineDiff.getTokenDiffs());
+ } else {
+ appendInsert(builder, nextBlock, j, null);
+ }
+ }
+ } else {
+ int prevDeleteLineIndex = 0;
+ int prevInsertLineIndex = 0;
+ for (Map.Entry<Integer, LineDiff> entry: lineChanges.entrySet()) {
+ int deleteLineIndex = entry.getKey();
+ LineDiff lineChange = entry.getValue();
+ int insertLineIndex = lineChange.getCompareLine();
+
+ appendDeletesAndInserts(builder, block, nextBlock, prevDeleteLineIndex, deleteLineIndex,
+ prevInsertLineIndex, insertLineIndex);
+
+ appendModification(builder, block, nextBlock, deleteLineIndex, insertLineIndex,
+ lineChange.getTokenDiffs());
+
+ prevDeleteLineIndex = deleteLineIndex+1;
+ prevInsertLineIndex = insertLineIndex+1;
+ }
+ appendDeletesAndInserts(builder, block, nextBlock,
+ prevDeleteLineIndex, block.getLines().size(),
+ prevInsertLineIndex, nextBlock.getLines().size());
+ }
+ i++;
+ } else {
+ for (int j=0; j<block.getLines().size(); j++)
+ appendDelete(builder, block, j, null);
+ }
+ } else {
+ for (int j=0; j<block.getLines().size(); j++)
+ appendDelete(builder, block, j, null);
+ }
+ } else {
+ for (int j=0; j<block.getLines().size(); j++)
+ appendInsert(builder, block, j, null);
+ }
+ }
+ return builder.toString();
+ }
+
+ private void appendDeletesAndInserts(StringBuilder builder, MarkAwareDiffBlock deleteBlock,
+ MarkAwareDiffBlock insertBlock, int fromDeleteLineIndex, int toDeleteLineIndex,
+ int fromInsertLineIndex, int toInsertLineIndex) {
+ if (diffMode == DiffViewMode.UNIFIED) {
+ for (int i=fromDeleteLineIndex; i<toDeleteLineIndex; i++)
+ appendDelete(builder, deleteBlock, i, null);
+ for (int i=fromInsertLineIndex; i<toInsertLineIndex; i++)
+ appendInsert(builder, insertBlock, i, null);
+ } else {
+ int deleteSize = toDeleteLineIndex - fromDeleteLineIndex;
+ int insertSize = toInsertLineIndex - fromInsertLineIndex;
+ if (deleteSize < insertSize) {
+ for (int i=fromDeleteLineIndex; i<toDeleteLineIndex; i++)
+ appendSideBySide(builder, deleteBlock, insertBlock, i, i-fromDeleteLineIndex+fromInsertLineIndex);
+ for (int i=fromInsertLineIndex+deleteSize; i<toInsertLineIndex; i++)
+ appendInsert(builder, insertBlock, i, null);
+ } else {
+ for (int i=fromInsertLineIndex; i<toInsertLineIndex; i++)
+ appendSideBySide(builder, deleteBlock, insertBlock, i-fromInsertLineIndex+fromDeleteLineIndex, i);
+ for (int i=fromDeleteLineIndex+insertSize; i<toDeleteLineIndex; i++)
+ appendDelete(builder, deleteBlock, i, null);
+ }
+ }
+ }
+
+ private void appendBlame(StringBuilder builder, int oldLineNo, int newLineNo) {
+ BlameCommit commit;
+ if (newLineNo != -1)
+ commit = Preconditions.checkNotNull(blameInfo.newBlame.get(newLineNo));
+ else
+ commit = Preconditions.checkNotNull(blameInfo.oldBlame.get(oldLineNo));
+ if (diffMode == DiffViewMode.UNIFIED && !commit.getHash().equals(blameInfo.lastCommitHash)
+ || diffMode == DiffViewMode.SPLIT && newLineNo != -1 && !commit.getHash().equals(blameInfo.lastNewCommitHash)
+ || diffMode == DiffViewMode.SPLIT && oldLineNo != -1 && !commit.getHash().equals(blameInfo.lastOldCommitHash)) {
+ CommitDetailPage.State state = new CommitDetailPage.State();
+ state.revision = commit.getHash();
+ state.whitespaceOption = change.getWhitespaceOption();
+ PageParameters params = CommitDetailPage.paramsOf(projectModel.getObject(), state);
+ String url = urlFor(CommitDetailPage.class, params).toString();
+ if (diffMode == DiffViewMode.UNIFIED) {
+ builder.append(String.format("<td class='blame noselect'><a class='hash' href='%s' data-hash='%s'>%s</a><span class='date'>%s</span><span class='author'>%s</span></td>",
+ url, commit.getHash(), GitUtils.abbreviateSHA(commit.getHash()),
+ DateUtils.formatDate(commit.getCommitter().getWhen()),
+ HtmlEscape.escapeHtml5(commit.getAuthor().getName())));
+ } else {
+ builder.append(String.format("<td class='abbr blame noselect'><a class='hash' href='%s' data-hash='%s'>%s</a></td>",
+ url, commit.getHash(), GitUtils.abbreviateSHA(commit.getHash())));
+ }
+ } else {
+ if (diffMode == DiffViewMode.UNIFIED) {
+ builder.append("<td class='blame noselect'><div class='same-as-above'>...</div></td>");
+ } else {
+ builder.append("<td class='abbr blame noselect'><div class='same-as-above'>...</div></td>");
+ }
+ }
+ blameInfo.lastCommitHash = commit.getHash();
+ if (newLineNo != -1)
+ blameInfo.lastNewCommitHash = commit.getHash();
+ if (oldLineNo != -1)
+ blameInfo.lastOldCommitHash = commit.getHash();
+ }
+
+ private String getOperationClass(Operation operation) {
+ if (operation == Operation.INSERT)
+ return "insert";
+ else if (operation == Operation.DELETE)
+ return "delete";
+ else
+ return null;
+ }
+
+ private void appendTokenized(StringBuilder builder, Tokenized tokenized) {
+ if (tokenized.getTokens().length == 0) {
+ builder.append("&nbsp;");
+ } else {
+ for (long token: tokenized.getTokens()) {
+ builder.append(TokenUtils.toHtml(tokenized.getText(), token, null, null));
+ }
+ }
+ }
+
+ private void appendEqual(StringBuilder builder, MarkAwareDiffBlock block, int lineIndex, int lastContextSize) {
+ if (lastContextSize != 0)
+ builder.append("<tr class='code expanded'>");
+ else
+ builder.append("<tr class='code original'>");
+
+ int oldLineNo = block.getOldStart() + lineIndex;
+ int newLineNo = block.getNewStart() + lineIndex;
+
+ if (diffMode == DiffViewMode.UNIFIED) {
+ if (blameInfo != null) {
+ appendBlame(builder, oldLineNo, newLineNo);
+ }
+ builder.append("<td class='number noselect'>").append(oldLineNo+1).append("</td>");
+ builder.append("<td class='number noselect'>").append(newLineNo+1).append("</td>");
+ builder.append("<td class='operation noselect'>&nbsp;</td>");
+ builder.append("<td class='content' data-old='").append(oldLineNo).append("' data-new='").append(newLineNo).append("'>");
+ appendTokenized(builder, block.getLines().get(lineIndex));
+ builder.append("</td>");
+ } else {
+ if (blameInfo != null) {
+ appendBlame(builder, oldLineNo, -1);
+ }
+ builder.append("<td class='number noselect'>").append(oldLineNo+1).append("</td>");
+ builder.append("<td class='operation noselect'>&nbsp;</td>");
+ builder.append("<td class='content left' data-old='").append(oldLineNo).append("' data-new='").append(newLineNo).append("'>");
+ appendTokenized(builder, block.getLines().get(lineIndex));
+ builder.append("</td>");
+ if (blameInfo != null) {
+ appendBlame(builder, -1, newLineNo);
+ }
+ builder.append("<td class='number noselect'>").append(newLineNo+1).append("</td>");
+ builder.append("<td class='operation noselect'>&nbsp;</td>");
+ builder.append("<td class='content right' data-old='").append(oldLineNo).append("' data-new='").append(newLineNo).append("'>");
+ appendTokenized(builder, block.getLines().get(lineIndex));
+ builder.append("</td>");
+ }
+ builder.append("</tr>");
+ }
+
+ private void appendInsert(StringBuilder builder, MarkAwareDiffBlock block, int lineIndex,
+ @Nullable List<DiffBlock<TextToken>> tokenDiffs) {
+ builder.append("<tr class='code original'>");
+
+ int newLineNo = block.getNewStart() + lineIndex;
+ if (diffMode == DiffViewMode.UNIFIED) {
+ if (blameInfo != null) {
+ appendBlame(builder, -1, newLineNo);
+ }
+ builder.append("<td class='number noselect new'>&nbsp;</td>");
+ builder.append("<td class='number noselect new'>").append(newLineNo+1).append("</td>");
+ builder.append("<td class='operation noselect new'>+</td>");
+ builder.append("<td class='content new' data-new='").append(newLineNo).append("'>");
+ if (tokenDiffs != null) {
+ if (tokenDiffs.isEmpty()) {
+ builder.append("&nbsp;");
+ } else {
+ for (DiffBlock<TextToken> tokenBlock: tokenDiffs) {
+ for (TextToken token: tokenBlock.getUnits()) {
+ if (tokenBlock.getOperation() != Operation.DELETE)
+ builder.append(TokenUtils.toHtml(token, getOperationClass(tokenBlock.getOperation()), null));
+ }
+ }
+ }
+ } else {
+ appendTokenized(builder, block.getLines().get(lineIndex));
+ }
+ builder.append("</td>");
+ } else {
+ if (blameInfo != null) {
+ builder.append("<td class='blame noselect'>&nbsp;</td>");
+ }
+ builder.append("<td class='number noselect'>&nbsp;</td>");
+ builder.append("<td class='operation noselect'>&nbsp;</td>");
+ builder.append("<td class='content left'>&nbsp;</td>");
+ if (blameInfo != null) {
+ appendBlame(builder, -1, newLineNo);
+ }
+ builder.append("<td class='number noselect new'>").append(newLineNo+1).append("</td>");
+ builder.append("<td class='operation noselect new'>+</td>");
+ builder.append("<td class='content right new' data-new='").append(newLineNo).append("'>");
+ appendTokenized(builder, block.getLines().get(lineIndex));
+ builder.append("</td>");
+ }
+ builder.append("</tr>");
+ }
+
+ private void appendDelete(StringBuilder builder, MarkAwareDiffBlock block, int lineIndex,
+ @Nullable List<DiffBlock<TextToken>> tokenDiffs) {
+ builder.append("<tr class='code original'>");
+
+ int oldLineNo = block.getOldStart() + lineIndex;
+ if (diffMode == DiffViewMode.UNIFIED ) {
+ if (blameInfo != null) {
+ appendBlame(builder, oldLineNo, -1);
+ }
+ builder.append("<td class='number noselect old'>").append(oldLineNo+1).append("</td>");
+ builder.append("<td class='number noselect old'>&nbsp;</td>");
+ builder.append("<td class='operation noselect old'>-</td>");
+ builder.append("<td class='content old' data-old='").append(oldLineNo).append("'>");
+ if (tokenDiffs != null) {
+ if (tokenDiffs.isEmpty()) {
+ builder.append("&nbsp;");
+ } else {
+ for (DiffBlock<TextToken> tokenBlock: tokenDiffs) {
+ for (TextToken token: tokenBlock.getUnits()) {
+ if (tokenBlock.getOperation() != Operation.INSERT)
+ builder.append(TokenUtils.toHtml(token, getOperationClass(tokenBlock.getOperation()), null));
+ }
+ }
+ }
+ } else {
+ appendTokenized(builder, block.getLines().get(lineIndex));
+ }
+ builder.append("</td>");
+ } else {
+ if (blameInfo != null) {
+ appendBlame(builder, oldLineNo, -1);
+ }
+ builder.append("<td class='number noselect old'>").append(oldLineNo+1).append("</td>");
+ builder.append("<td class='operation noselect old'>-</td>");
+ builder.append("<td class='content left old' data-old='").append(oldLineNo).append("'>");
+ appendTokenized(builder, block.getLines().get(lineIndex));
+ builder.append("</td>");
+ if (blameInfo != null) {
+ builder.append("<td class='blame noselect'>&nbsp;</td>");
+ }
+ builder.append("<td class='number noselect'>&nbsp;</td>");
+ builder.append("<td class='operation noselect'>&nbsp;</td>");
+ builder.append("<td class='content right'>&nbsp;</td>");
+ }
+ builder.append("</tr>");
+ }
+
+ private void appendSideBySide(StringBuilder builder, MarkAwareDiffBlock deleteBlock,
+ MarkAwareDiffBlock insertBlock, int deleteLineIndex, int insertLineIndex) {
+ builder.append("<tr class='code original'>");
+
+ int oldLineNo = deleteBlock.getOldStart()+deleteLineIndex;
+ if (blameInfo != null) {
+ appendBlame(builder, oldLineNo, -1);
+ }
+ builder.append("<td class='number noselect old'>").append(oldLineNo+1).append("</td>");
+ builder.append("<td class='operation noselect old'>-</td>");
+ builder.append("<td class='content left old' data-old='").append(oldLineNo).append("'>");
+ appendTokenized(builder, deleteBlock.getLines().get(deleteLineIndex));
+ builder.append("</td>");
+
+ int newLineNo = insertBlock.getNewStart()+insertLineIndex;
+ if (blameInfo != null) {
+ appendBlame(builder, -1, newLineNo);
+ }
+ builder.append("<td class='number noselect new'>").append(newLineNo+1).append("</td>");
+ builder.append("<td class='operation noselect new'>+</td>");
+ builder.append("<td class='content right new' data-new='").append(newLineNo).append("'>");
+ appendTokenized(builder, insertBlock.getLines().get(insertLineIndex));
+ builder.append("</td>");
+
+ builder.append("</tr>");
+ }
+
+ private void appendModification(StringBuilder builder, MarkAwareDiffBlock deleteBlock,
+ MarkAwareDiffBlock insertBlock, int deleteLineIndex, int insertLineIndex,
+ List<DiffBlock<TextToken>> tokenDiffs) {
+ builder.append("<tr class='code original'>");
+
+ int oldLineNo = deleteBlock.getOldStart() + deleteLineIndex;
+ int newLineNo = insertBlock.getNewStart() + insertLineIndex;
+ if (diffMode == DiffViewMode.UNIFIED) {
+ if (blameInfo != null) {
+ appendBlame(builder, oldLineNo, newLineNo);
+ }
+ builder.append("<td class='number noselect old new'>").append(oldLineNo+1).append("</td>");
+ builder.append("<td class='number noselect old new'>").append(newLineNo+1).append("</td>");
+ builder.append("<td class='operation noselect old new'>*</td>");
+ builder.append("<td class='content old new' data-old='").append(oldLineNo).append("' data-new='").append(newLineNo).append("'>");
+ if (tokenDiffs.isEmpty()) {
+ builder.append("&nbsp;");
+ } else {
+ for (DiffBlock<TextToken> tokenBlock: tokenDiffs) {
+ for (TextToken token: tokenBlock.getUnits())
+ builder.append(TokenUtils.toHtml(token, getOperationClass(tokenBlock.getOperation()), null));
+ }
+ }
+ builder.append("</td>");
+ } else {
+ if (blameInfo != null) {
+ appendBlame(builder, oldLineNo, -1);
+ }
+ builder.append("<td class='number noselect old'>").append(oldLineNo+1).append("</td>");
+ builder.append("<td class='operation noselect old'>-</td>");
+ builder.append("<td class='content left old' data-old='").append(oldLineNo).append("'>");
+ if (tokenDiffs.isEmpty()) {
+ builder.append("&nbsp;");
+ } else {
+ for (DiffBlock<TextToken> tokenBlock: tokenDiffs) {
+ for (TextToken token: tokenBlock.getUnits()) {
+ if (tokenBlock.getOperation() != Operation.INSERT)
+ builder.append(TokenUtils.toHtml(token, getOperationClass(tokenBlock.getOperation()), null));
+ }
+ }
+ }
+ builder.append("</td>");
+
+ if (blameInfo != null) {
+ appendBlame(builder, -1, newLineNo);
+ }
+ builder.append("<td class='number noselect new'>").append(newLineNo+1).append("</td>");
+ builder.append("<td class='operation noselect new'>+</td>");
+ builder.append("<td class='content right new' data-new='").append(newLineNo).append("'>");
+ if (tokenDiffs.isEmpty()) {
+ builder.append("&nbsp;");
+ } else {
+ for (DiffBlock<TextToken> tokenBlock: tokenDiffs) {
+ for (TextToken token: tokenBlock.getUnits()) {
+ if (tokenBlock.getOperation() != Operation.DELETE)
+ builder.append(TokenUtils.toHtml(token, getOperationClass(tokenBlock.getOperation()), null));
+ }
+ }
+ }
+ builder.append("</td>");
+ }
+
+ builder.append("</tr>");
+ }
+
+ private void appendExpander(StringBuilder builder, int blockIndex, int skippedLines) {
+ builder.append("<tr class='expander expander").append(blockIndex).append("'>");
+
+ String script = String.format("javascript:$('#%s').data('callback')('expand', %d);", getMarkupId(), blockIndex);
+ if (diffMode == DiffViewMode.UNIFIED) {
+ if (blameInfo != null) {
+ builder.append("<td colspan='3' class='expander noselect'><a title='Show more lines' href=\"")
+ .append(script).append("\"><i class='fa fa-sort'></i></a></td>");
+ blameInfo.lastCommitHash = null;
+ blameInfo.lastOldCommitHash = null;
+ blameInfo.lastNewCommitHash = null;
+ } else {
+ builder.append("<td colspan='2' class='expander noselect'><a title='Show more lines' href=\"")
+ .append(script).append("\"><i class='fa fa-sort'></i></a></td>");
+ }
+ builder.append("<td colspan='2' class='skipped noselect'><i class='fa fa-ellipsis-h'></i> skipped ")
+ .append(skippedLines).append(" lines <i class='fa fa-ellipsis-h'></i></td>");
+ } else {
+ if (blameInfo != null) {
+ builder.append("<td colspan='2' class='expander noselect'><a title='Show more lines' href=\"").append(script)
+ .append("\"><i class='fa fa-sort'></i></a></td>");
+ builder.append("<td class='skipped noselect' colspan='6'><i class='fa fa-ellipsis-h'></i> skipped ")
+ .append(skippedLines).append(" lines <i class='fa fa-ellipsis-h'></i></td>");
+ blameInfo.lastCommitHash = null;
+ blameInfo.lastOldCommitHash = null;
+ blameInfo.lastNewCommitHash = null;
+ } else {
+ builder.append("<td class='expander noselect'><a title='Show more lines' href=\"").append(script)
+ .append("\"><i class='fa fa-sort'></i></a></td>");
+ builder.append("<td class='skipped noselect' colspan='5'><i class='fa fa-ellipsis-h'></i> skipped ")
+ .append(skippedLines).append(" lines <i class='fa fa-ellipsis-h'></i></td>");
+ }
+ }
+ builder.append("</tr>");
+ }
+
+ private List<MarkAwareDiffBlock> getDiffBlocks() {
+ if (diffBlocks == null) {
+ diffBlocks = new ArrayList<>();
+ List<LinearRange> oldRanges = new ArrayList<>();
+ List<LinearRange> newRanges = new ArrayList<>();
+ if (commentSupport != null) {
+ String oldCommitHash = getOldCommit().name();
+ for (MarkPos each: initialMarks) {
+ LinearRange range = new LinearRange(each.getRange().fromRow, each.getRange().toRow+1);
+ if (each.getCommit().equals(oldCommitHash)) {
+ oldRanges.add(range);
+ } else {
+ newRanges.add(range);
+ }
+ }
+ }
+
+ for (DiffBlock<Tokenized> diffBlock: change.getDiffBlocks()) {
+ if (diffBlock.getOperation() == Operation.DELETE) {
+ diffBlocks.add(new MarkAwareDiffBlock(Type.DELETE, diffBlock.getUnits(),
+ diffBlock.getOldStart(), diffBlock.getNewStart()));
+ } else if (diffBlock.getOperation() == Operation.INSERT) {
+ diffBlocks.add(new MarkAwareDiffBlock(Type.INSERT, diffBlock.getUnits(),
+ diffBlock.getOldStart(), diffBlock.getNewStart()));
+ } else {
+ List<LinearRange> ranges = new ArrayList<>();
+ for (LinearRange range: oldRanges) {
+ ranges.add(new LinearRange(range.getFrom()-diffBlock.getOldStart(), range.getTo()-diffBlock.getOldStart()));
+ }
+ for (LinearRange range: newRanges) {
+ ranges.add(new LinearRange(range.getFrom()-diffBlock.getNewStart(), range.getTo()-diffBlock.getNewStart()));
+ }
+ ranges = RangeUtils.merge(ranges);
+
+ int lastIndex = 0;
+ for (LinearRange range: ranges) {
+ int from = range.getFrom();
+ int to = range.getTo();
+ if (from < diffBlock.getUnits().size() && to > 0) {
+ if (from < lastIndex)
+ from = lastIndex;
+ if (to > diffBlock.getUnits().size())
+ to = diffBlock.getUnits().size();
+ if (lastIndex < from) {
+ List<Tokenized> lines = diffBlock.getUnits().subList(lastIndex, from);
+ diffBlocks.add(new MarkAwareDiffBlock(Type.EQUAL, lines,
+ diffBlock.getOldStart()+lastIndex, diffBlock.getNewStart()+lastIndex));
+ }
+ if (from < to) {
+ List<Tokenized> lines = diffBlock.getUnits().subList(from, to);
+ diffBlocks.add(new MarkAwareDiffBlock(Type.MARKED_EQUAL, lines,
+ diffBlock.getOldStart()+from, diffBlock.getNewStart()+from));
+ }
+ lastIndex = to;
+ }
+ }
+
+ if (lastIndex < diffBlock.getUnits().size()) {
+ List<Tokenized> lines = diffBlock.getUnits().subList(lastIndex, diffBlock.getUnits().size());
+ diffBlocks.add(new MarkAwareDiffBlock(Type.EQUAL, lines,
+ diffBlock.getOldStart()+lastIndex, diffBlock.getNewStart()+lastIndex));
+ }
+ }
+ }
+ }
+ return diffBlocks;
+ }
+
+ @Override
+ protected void onDetach() {
+ projectModel.detach();
+ requestModel.detach();
+
+ if (blameModel != null)
+ blameModel.detach();
+
+ super.onDetach();
+ }
+
+ private String getJsonOfComment(CodeComment comment) {
+ CommentInfo commentInfo = new CommentInfo();
+ commentInfo.id = comment.getId();
+ commentInfo.mark = new MarkInfo(comment, getOldCommit().name());
+
+ String jsonOfCommentInfo;
+ try {
+ jsonOfCommentInfo = OneDev.getInstance(ObjectMapper.class).writeValueAsString(commentInfo);
+ } catch (JsonProcessingException e) {
+ throw new RuntimeException(e);
+ }
+ return jsonOfCommentInfo;
+ }
+
+ @Override
+ public void onCommentDeleted(AjaxRequestTarget target, CodeComment comment) {
+ String script = String.format("onedev.server.textDiff.onCommentDeleted($('#%s'), %s);",
+ getMarkupId(), getJsonOfComment(comment));
+ target.appendJavaScript(script);
+ mark(target, null);
+ }
+
+ @Override
+ public void onCommentClosed(AjaxRequestTarget target, CodeComment comment) {
+ String script = String.format("onedev.server.textDiff.onCloseComment($('#%s'));", getMarkupId());
+ target.appendJavaScript(script);
+ mark(target, null);
+ }
+
+ @Override
+ public void onCommentAdded(AjaxRequestTarget target, CodeComment comment) {
+ String script = String.format("onedev.server.textDiff.onCommentAdded($('#%s'), %s);",
+ getMarkupId(), getJsonOfComment(comment));
+ target.appendJavaScript(script);
+ }
+
+ @Override
+ public void mark(AjaxRequestTarget target, MarkPos mark) {
+ String script;
+ if (mark != null) {
+ script = String.format(""
+ + "var $container = $('#%s');"
+ + "var mark = %s;"
+ + "onedev.server.textDiff.scrollTo($container, mark);"
+ + "onedev.server.textDiff.mark($container, mark);",
+ getMarkupId(), getJson(mark));
+ } else {
+ script = String.format(""
+ + "var $container = $('#%s');"
+ + "onedev.server.textDiff.clearMark($container);"
+ + "$container.removeData('mark');",
+ getMarkupId());
+ }
+ target.appendJavaScript(script);
+ }
+
+ @Override
+ public void onUnblame(AjaxRequestTarget target) {
+ blameInfo = null;
+ target.add(this);
+ }
+
+ @SuppressWarnings("unused")
+ private static class CommentInfo {
+ long id;
+
+ String title;
+
+ MarkInfo mark;
+ }
+
+ @SuppressWarnings("unused")
+ private static class MarkInfo extends PlanarRange {
+
+ String path;
+
+ boolean leftSide;
+
+ public MarkInfo() {
+
+ }
+
+ public MarkInfo(CodeComment comment, String oldCommitHash) {
+ super(comment.getMarkPos().getRange());
+ path = comment.getMarkPos().getPath();
+ leftSide = comment.getMarkPos().getCommit().equals(oldCommitHash);
+ }
+
+ public MarkInfo(MarkPos mark, String oldCommitHash) {
+ super(mark.getRange());
+ path = mark.getPath();
+ leftSide = mark.getCommit().equals(oldCommitHash);
+ }
+
+ }
+
+ private static class BlameInfo implements Serializable {
+
+ Map<Integer, BlameCommit> oldBlame = new HashMap<>();
+
+ Map<Integer, BlameCommit> newBlame = new HashMap<>();
+
+ String lastCommitHash;
+
+ String lastOldCommitHash;
+
+ String lastNewCommitHash;
+
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java
index 16baddaa02..58399e6e67 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java
@@ -80,7 +80,7 @@ import io.onedev.server.model.support.CompareContext;
import io.onedev.server.model.support.MarkPos;
import io.onedev.server.model.support.ProjectAndRevision;
import io.onedev.server.search.code.IndexManager;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.diff.DiffUtils;
import io.onedev.server.util.diff.WhitespaceOption;
import io.onedev.server.util.patternset.PatternSet;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/entity/nav/EntityNavPanel.java b/server-core/src/main/java/io/onedev/server/web/component/entity/nav/EntityNavPanel.java
index ff0a6f062d..651cf1fcb5 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/entity/nav/EntityNavPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/entity/nav/EntityNavPanel.java
@@ -18,7 +18,7 @@ import io.onedev.commons.utils.ReflectionUtils;
import io.onedev.commons.utils.WordUtils;
import io.onedev.server.model.AbstractEntity;
import io.onedev.server.search.entity.EntityQuery;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.util.QueryPosition;
import io.onedev.server.web.util.QueryPositionSupport;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/entity/watches/EntityWatchesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/entity/watches/EntityWatchesPanel.java
index c2ca9dbfbd..20aff0ac1b 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/entity/watches/EntityWatchesPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/entity/watches/EntityWatchesPanel.java
@@ -18,7 +18,7 @@ import org.apache.wicket.model.LoadableDetachableModel;
import io.onedev.server.model.AbstractEntity;
import io.onedev.server.model.User;
import io.onedev.server.model.support.EntityWatch;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.facade.UserFacade;
import io.onedev.server.util.watch.WatchStatus;
import io.onedev.server.web.component.user.ident.UserIdentPanel;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java
index d927c6b705..ecadd8a7d1 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java
@@ -43,7 +43,7 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.support.issue.changedata.IssueReferencedFromCodeCommentData;
import io.onedev.server.model.support.issue.changedata.IssueReferencedFromIssueData;
import io.onedev.server.model.support.issue.changedata.IssueReferencedFromPullRequestData;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.behavior.WebSocketObserver;
import io.onedev.server.web.component.issue.activities.activity.IssueActivity;
import io.onedev.server.web.component.issue.activities.activity.IssueChangeActivity;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/DiffAndCommentAwarePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/DiffAndCommentAwarePanel.java
index 2b7c278bce..bfa6d0fba8 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/DiffAndCommentAwarePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/DiffAndCommentAwarePanel.java
@@ -8,7 +8,7 @@ import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.IssueChangeManager;
import io.onedev.server.model.IssueChange;
import io.onedev.server.model.Project;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.diff.DiffSupport;
import io.onedev.server.web.component.diff.plain.PlainDiffPanel;
import io.onedev.server.web.component.markdown.AttachmentSupport;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedPanel.java
index c638550a64..2c409fe483 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedPanel.java
@@ -9,8 +9,8 @@ import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.IssueCommentManager;
import io.onedev.server.model.IssueComment;
import io.onedev.server.model.Project;
-import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.facade.UserFacade;
import io.onedev.server.util.userident.UserIdent;
import io.onedev.server.web.component.markdown.AttachmentSupport;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedPanel.java
index 1eb95da28d..22cbc80af2 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedPanel.java
@@ -9,8 +9,8 @@ import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.IssueChangeManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
-import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.facade.UserFacade;
import io.onedev.server.util.userident.UserIdent;
import io.onedev.server.web.component.markdown.AttachmentSupport;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.java
index c41dffbafa..cf746c4e7e 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.java
@@ -18,7 +18,7 @@ import org.eclipse.jgit.revwalk.RevCommit;
import io.onedev.server.git.GitUtils;
import io.onedev.server.model.Issue;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;
import io.onedev.server.web.component.commit.message.CommitMessagePanel;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java b/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java
index 3f93f1571b..99038cd7c7 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java
@@ -28,8 +28,8 @@ import io.onedev.server.model.Milestone;
import io.onedev.server.model.Project;
import io.onedev.server.model.support.setting.GlobalIssueSetting;
import io.onedev.server.search.entity.issue.IssueCriteria;
-import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.IssueUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.inputspec.InputContext;
import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.web.component.markdown.AttachmentSupport;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java
index 4cfb74ad5e..34e3a020aa 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java
@@ -1,342 +1,342 @@
-package io.onedev.server.web.component.issue.list;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.annotation.Nullable;
-
-import org.apache.wicket.AttributeModifier;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
-import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.ajax.markup.html.form.AjaxButton;
-import org.apache.wicket.behavior.Behavior;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.form.CheckBox;
-import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.list.ListItem;
-import org.apache.wicket.markup.html.list.ListView;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.PropertyModel;
-
-import com.google.common.base.Optional;
-import com.google.common.collect.Lists;
-
-import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.IssueChangeManager;
-import io.onedev.server.entitymanager.SettingManager;
-import io.onedev.server.model.Issue;
-import io.onedev.server.model.Milestone;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.support.setting.GlobalIssueSetting;
-import io.onedev.server.search.entity.issue.IssueQuery;
-import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.util.IssueConstants;
-import io.onedev.server.util.IssueUtils;
-import io.onedev.server.util.inputspec.InputContext;
-import io.onedev.server.util.inputspec.InputSpec;
-import io.onedev.server.util.usermatcher.UserMatcher;
-import io.onedev.server.web.ajaxlistener.DisableGlobalLoadingIndicatorListener;
-import io.onedev.server.web.behavior.RunTaskBehavior;
-import io.onedev.server.web.component.project.comment.CommentInput;
-import io.onedev.server.web.editable.BeanContext;
-import io.onedev.server.web.editable.BeanDescriptor;
-import io.onedev.server.web.editable.BeanEditor;
-import io.onedev.server.web.editable.PropertyDescriptor;
-
-@SuppressWarnings("serial")
-abstract class BatchEditPanel extends Panel implements InputContext {
-
- private Set<String> selectedFields = new HashSet<>();
-
- private BuiltInFieldsBean builtInFieldsBean;
-
- private Serializable customFieldsBean;
-
- private BeanEditor builtInFieldsEditor;
-
- private BeanEditor customFieldsEditor;
-
- private String comment;
-
- public BatchEditPanel(String id) {
- super(id);
- }
-
- private Behavior newOnChangeBehavior(Form<?> form) {
- return new AjaxFormComponentUpdatingBehavior("change") {
-
- @Override
- protected void onUpdate(AjaxRequestTarget target) {
- for (List<PropertyDescriptor> values: builtInFieldsEditor.getDescriptor().getProperties().values()) {
- for (PropertyDescriptor value: values)
- value.setPropertyExcluded(!selectedFields.contains(value.getDisplayName()));
- }
- for (List<PropertyDescriptor> values: customFieldsEditor.getDescriptor().getProperties().values()) {
- for (PropertyDescriptor value: values)
- value.setPropertyExcluded(!selectedFields.contains(value.getDisplayName()));
- }
- target.add(form);
- }
-
- };
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- Form<?> form = new Form<Void>("form");
- form.setOutputMarkupId(true);
-
- form.add(new Label("title", "Batch Editing " + getIssueCount() + " Issues"));
-
- form.add(new NotificationPanel("feedback", form));
-
- form.add(new CheckBox("stateCheck", new IModel<Boolean>() {
-
- @Override
- public void detach() {
- }
-
- @Override
- public Boolean getObject() {
- return selectedFields.contains(IssueConstants.FIELD_STATE);
- }
-
- @Override
- public void setObject(Boolean object) {
- if (object)
- selectedFields.add(IssueConstants.FIELD_STATE);
- else
- selectedFields.remove(IssueConstants.FIELD_STATE);
- }
-
- }).add(newOnChangeBehavior(form)));
-
- form.add(new CheckBox("milestoneCheck", new IModel<Boolean>() {
-
- @Override
- public void detach() {
- }
-
- @Override
- public Boolean getObject() {
- return selectedFields.contains(IssueConstants.FIELD_MILESTONE);
- }
-
- @Override
- public void setObject(Boolean object) {
- if (object)
- selectedFields.add(IssueConstants.FIELD_MILESTONE);
- else
- selectedFields.remove(IssueConstants.FIELD_MILESTONE);
- }
-
- }).add(newOnChangeBehavior(form)));
-
- List<String> customFieldNames = new ArrayList<>();
- for (InputSpec field: getIssueSetting().getFieldSpecs()) {
- if (UserMatcher.fromString(field.getCanBeChangedBy()).matches(getProject(), SecurityUtils.getUser()))
- customFieldNames.add(field.getName());
- }
-
- form.add(new ListView<String>("customFields", customFieldNames) {
-
- @Override
- protected void populateItem(ListItem<String> item) {
- item.add(new CheckBox("customFieldCheck", new IModel<Boolean>() {
-
- @Override
- public void detach() {
- }
-
- @Override
- public Boolean getObject() {
- return selectedFields.contains(item.getModelObject());
- }
-
- @Override
- public void setObject(Boolean object) {
- if (object)
- selectedFields.add(item.getModelObject());
- else
- selectedFields.remove(item.getModelObject());
- }
-
- }).add(newOnChangeBehavior(form)));
- item.add(new Label("name", item.getModelObject()));
- }
-
- });
-
- builtInFieldsBean = new BuiltInFieldsBean();
- Class<? extends Serializable> fieldBeanClass = IssueUtils.defineFieldBeanClass(getProject());
- Issue issue = new Issue();
- issue.setProject(getProject());
- if (getIssueQuery() != null && getIssueQuery().getCriteria() != null) {
- getIssueQuery().getCriteria().fill(issue);
- builtInFieldsBean.setMilestone(issue.getMilestoneName());
- customFieldsBean = issue.getFieldBean(fieldBeanClass, false);
- } else {
- try {
- customFieldsBean = fieldBeanClass.newInstance();
- } catch (InstantiationException | IllegalAccessException e) {
- throw new RuntimeException(e);
- }
- IssueUtils.clearFields(customFieldsBean);
- }
-
- Set<String> excludedProperties = new HashSet<>();
- if (!selectedFields.contains(IssueConstants.FIELD_STATE))
- excludedProperties.add(IssueConstants.ATTR_STATE);
- if (!selectedFields.contains(IssueConstants.FIELD_MILESTONE))
- excludedProperties.add(IssueConstants.ATTR_MILESTONE);
-
- builtInFieldsEditor = BeanContext.edit("builtInFieldsEditor", builtInFieldsBean, excludedProperties, true);
- form.add(builtInFieldsEditor);
-
- excludedProperties = new HashSet<>();
- for (List<PropertyDescriptor> values: new BeanDescriptor(customFieldsBean.getClass()).getProperties().values()) {
- for (PropertyDescriptor value: values) {
- if (!selectedFields.contains(value.getDisplayName()))
- excludedProperties.add(value.getPropertyName());
- }
- }
-
- customFieldsEditor = BeanContext.edit("customFieldsEditor", customFieldsBean, excludedProperties, true);
- form.add(customFieldsEditor);
-
- form.add(new CommentInput("comment", new PropertyModel<String>(this, "comment"), false) {
-
- @Override
- protected Project getProject() {
- return BatchEditPanel.this.getProject();
- }
-
- @Override
- protected List<AttributeModifier> getInputModifiers() {
- return Lists.newArrayList(AttributeModifier.replace("placeholder", "Leave a comment"));
- }
-
- });
- form.add(new AjaxButton("save") {
-
- private RunTaskBehavior runTaskBehavior;
-
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- attributes.getAjaxCallListeners().add(new DisableGlobalLoadingIndicatorListener());
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- add(runTaskBehavior = new RunTaskBehavior() {
-
- @Override
- protected void runTask(AjaxRequestTarget target) {
- String state;
- if (selectedFields.contains(IssueConstants.FIELD_STATE))
- state = builtInFieldsBean.getState();
- else
- state = null;
-
- Optional<Milestone> milestone;
- if (selectedFields.contains(IssueConstants.FIELD_MILESTONE))
- milestone = Optional.fromNullable(getProject().getMilestone(builtInFieldsBean.getMilestone()));
- else
- milestone = null;
-
- Map<String, Object> fieldValues = IssueUtils.getFieldValues(customFieldsEditor.getOneContext(),
- customFieldsBean, selectedFields);
- OneDev.getInstance(IssueChangeManager.class).batchUpdate(
- getIssueIterator(), state, milestone, fieldValues, comment, SecurityUtils.getUser());
- onUpdated(target);
- }
-
- });
- }
-
- @Override
- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
- super.onSubmit(target, form);
-
- if (!selectedFields.isEmpty()) {
- runTaskBehavior.requestRun(target);
- } else {
- form.error("Please select fields to update");
- target.add(form);
- }
- }
-
- @Override
- protected void onError(AjaxRequestTarget target, Form<?> form) {
- super.onError(target, form);
- target.add(form);
- }
-
- });
-
- form.add(new AjaxLink<Void>("close") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- onCancel(target);
- }
-
- });
- form.add(new AjaxLink<Void>("cancel") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- onCancel(target);
- }
-
- });
-
- add(form);
- }
-
- private GlobalIssueSetting getIssueSetting() {
- return OneDev.getInstance(SettingManager.class).getIssueSetting();
- }
-
- @Override
- public List<String> getInputNames() {
- return getIssueSetting().getFieldNames();
- }
-
- @Override
- public InputSpec getInputSpec(String inputName) {
- return getIssueSetting().getFieldSpec(inputName);
- }
-
- @Override
- public void validateName(String inputName) {
- throw new UnsupportedOperationException();
- }
-
- protected abstract Project getProject();
-
- @Nullable
- protected abstract IssueQuery getIssueQuery();
-
- protected abstract Iterator<? extends Issue> getIssueIterator();
-
- protected abstract int getIssueCount();
-
- protected abstract void onUpdated(AjaxRequestTarget target);
-
- protected abstract void onCancel(AjaxRequestTarget target);
-
+package io.onedev.server.web.component.issue.list;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.annotation.Nullable;
+
+import org.apache.wicket.AttributeModifier;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.ajax.markup.html.form.AjaxButton;
+import org.apache.wicket.behavior.Behavior;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.form.CheckBox;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.list.ListItem;
+import org.apache.wicket.markup.html.list.ListView;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.PropertyModel;
+
+import com.google.common.base.Optional;
+import com.google.common.collect.Lists;
+
+import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.IssueChangeManager;
+import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.model.Issue;
+import io.onedev.server.model.Milestone;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.support.setting.GlobalIssueSetting;
+import io.onedev.server.search.entity.issue.IssueQuery;
+import io.onedev.server.util.IssueConstants;
+import io.onedev.server.util.IssueUtils;
+import io.onedev.server.util.SecurityUtils;
+import io.onedev.server.util.inputspec.InputContext;
+import io.onedev.server.util.inputspec.InputSpec;
+import io.onedev.server.util.usermatcher.UserMatcher;
+import io.onedev.server.web.ajaxlistener.DisableGlobalLoadingIndicatorListener;
+import io.onedev.server.web.behavior.RunTaskBehavior;
+import io.onedev.server.web.component.project.comment.CommentInput;
+import io.onedev.server.web.editable.BeanContext;
+import io.onedev.server.web.editable.BeanDescriptor;
+import io.onedev.server.web.editable.BeanEditor;
+import io.onedev.server.web.editable.PropertyDescriptor;
+
+@SuppressWarnings("serial")
+abstract class BatchEditPanel extends Panel implements InputContext {
+
+ private Set<String> selectedFields = new HashSet<>();
+
+ private BuiltInFieldsBean builtInFieldsBean;
+
+ private Serializable customFieldsBean;
+
+ private BeanEditor builtInFieldsEditor;
+
+ private BeanEditor customFieldsEditor;
+
+ private String comment;
+
+ public BatchEditPanel(String id) {
+ super(id);
+ }
+
+ private Behavior newOnChangeBehavior(Form<?> form) {
+ return new AjaxFormComponentUpdatingBehavior("change") {
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ for (List<PropertyDescriptor> values: builtInFieldsEditor.getDescriptor().getProperties().values()) {
+ for (PropertyDescriptor value: values)
+ value.setPropertyExcluded(!selectedFields.contains(value.getDisplayName()));
+ }
+ for (List<PropertyDescriptor> values: customFieldsEditor.getDescriptor().getProperties().values()) {
+ for (PropertyDescriptor value: values)
+ value.setPropertyExcluded(!selectedFields.contains(value.getDisplayName()));
+ }
+ target.add(form);
+ }
+
+ };
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ Form<?> form = new Form<Void>("form");
+ form.setOutputMarkupId(true);
+
+ form.add(new Label("title", "Batch Editing " + getIssueCount() + " Issues"));
+
+ form.add(new NotificationPanel("feedback", form));
+
+ form.add(new CheckBox("stateCheck", new IModel<Boolean>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public Boolean getObject() {
+ return selectedFields.contains(IssueConstants.FIELD_STATE);
+ }
+
+ @Override
+ public void setObject(Boolean object) {
+ if (object)
+ selectedFields.add(IssueConstants.FIELD_STATE);
+ else
+ selectedFields.remove(IssueConstants.FIELD_STATE);
+ }
+
+ }).add(newOnChangeBehavior(form)));
+
+ form.add(new CheckBox("milestoneCheck", new IModel<Boolean>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public Boolean getObject() {
+ return selectedFields.contains(IssueConstants.FIELD_MILESTONE);
+ }
+
+ @Override
+ public void setObject(Boolean object) {
+ if (object)
+ selectedFields.add(IssueConstants.FIELD_MILESTONE);
+ else
+ selectedFields.remove(IssueConstants.FIELD_MILESTONE);
+ }
+
+ }).add(newOnChangeBehavior(form)));
+
+ List<String> customFieldNames = new ArrayList<>();
+ for (InputSpec field: getIssueSetting().getFieldSpecs()) {
+ if (UserMatcher.fromString(field.getCanBeChangedBy()).matches(getProject(), SecurityUtils.getUser()))
+ customFieldNames.add(field.getName());
+ }
+
+ form.add(new ListView<String>("customFields", customFieldNames) {
+
+ @Override
+ protected void populateItem(ListItem<String> item) {
+ item.add(new CheckBox("customFieldCheck", new IModel<Boolean>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public Boolean getObject() {
+ return selectedFields.contains(item.getModelObject());
+ }
+
+ @Override
+ public void setObject(Boolean object) {
+ if (object)
+ selectedFields.add(item.getModelObject());
+ else
+ selectedFields.remove(item.getModelObject());
+ }
+
+ }).add(newOnChangeBehavior(form)));
+ item.add(new Label("name", item.getModelObject()));
+ }
+
+ });
+
+ builtInFieldsBean = new BuiltInFieldsBean();
+ Class<? extends Serializable> fieldBeanClass = IssueUtils.defineFieldBeanClass(getProject());
+ Issue issue = new Issue();
+ issue.setProject(getProject());
+ if (getIssueQuery() != null && getIssueQuery().getCriteria() != null) {
+ getIssueQuery().getCriteria().fill(issue);
+ builtInFieldsBean.setMilestone(issue.getMilestoneName());
+ customFieldsBean = issue.getFieldBean(fieldBeanClass, false);
+ } else {
+ try {
+ customFieldsBean = fieldBeanClass.newInstance();
+ } catch (InstantiationException | IllegalAccessException e) {
+ throw new RuntimeException(e);
+ }
+ IssueUtils.clearFields(customFieldsBean);
+ }
+
+ Set<String> excludedProperties = new HashSet<>();
+ if (!selectedFields.contains(IssueConstants.FIELD_STATE))
+ excludedProperties.add(IssueConstants.ATTR_STATE);
+ if (!selectedFields.contains(IssueConstants.FIELD_MILESTONE))
+ excludedProperties.add(IssueConstants.ATTR_MILESTONE);
+
+ builtInFieldsEditor = BeanContext.edit("builtInFieldsEditor", builtInFieldsBean, excludedProperties, true);
+ form.add(builtInFieldsEditor);
+
+ excludedProperties = new HashSet<>();
+ for (List<PropertyDescriptor> values: new BeanDescriptor(customFieldsBean.getClass()).getProperties().values()) {
+ for (PropertyDescriptor value: values) {
+ if (!selectedFields.contains(value.getDisplayName()))
+ excludedProperties.add(value.getPropertyName());
+ }
+ }
+
+ customFieldsEditor = BeanContext.edit("customFieldsEditor", customFieldsBean, excludedProperties, true);
+ form.add(customFieldsEditor);
+
+ form.add(new CommentInput("comment", new PropertyModel<String>(this, "comment"), false) {
+
+ @Override
+ protected Project getProject() {
+ return BatchEditPanel.this.getProject();
+ }
+
+ @Override
+ protected List<AttributeModifier> getInputModifiers() {
+ return Lists.newArrayList(AttributeModifier.replace("placeholder", "Leave a comment"));
+ }
+
+ });
+ form.add(new AjaxButton("save") {
+
+ private RunTaskBehavior runTaskBehavior;
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new DisableGlobalLoadingIndicatorListener());
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(runTaskBehavior = new RunTaskBehavior() {
+
+ @Override
+ protected void runTask(AjaxRequestTarget target) {
+ String state;
+ if (selectedFields.contains(IssueConstants.FIELD_STATE))
+ state = builtInFieldsBean.getState();
+ else
+ state = null;
+
+ Optional<Milestone> milestone;
+ if (selectedFields.contains(IssueConstants.FIELD_MILESTONE))
+ milestone = Optional.fromNullable(getProject().getMilestone(builtInFieldsBean.getMilestone()));
+ else
+ milestone = null;
+
+ Map<String, Object> fieldValues = IssueUtils.getFieldValues(customFieldsEditor.getOneContext(),
+ customFieldsBean, selectedFields);
+ OneDev.getInstance(IssueChangeManager.class).batchUpdate(
+ getIssueIterator(), state, milestone, fieldValues, comment, SecurityUtils.getUser());
+ onUpdated(target);
+ }
+
+ });
+ }
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
+ super.onSubmit(target, form);
+
+ if (!selectedFields.isEmpty()) {
+ runTaskBehavior.requestRun(target);
+ } else {
+ form.error("Please select fields to update");
+ target.add(form);
+ }
+ }
+
+ @Override
+ protected void onError(AjaxRequestTarget target, Form<?> form) {
+ super.onError(target, form);
+ target.add(form);
+ }
+
+ });
+
+ form.add(new AjaxLink<Void>("close") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onCancel(target);
+ }
+
+ });
+ form.add(new AjaxLink<Void>("cancel") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onCancel(target);
+ }
+
+ });
+
+ add(form);
+ }
+
+ private GlobalIssueSetting getIssueSetting() {
+ return OneDev.getInstance(SettingManager.class).getIssueSetting();
+ }
+
+ @Override
+ public List<String> getInputNames() {
+ return getIssueSetting().getFieldNames();
+ }
+
+ @Override
+ public InputSpec getInputSpec(String inputName) {
+ return getIssueSetting().getFieldSpec(inputName);
+ }
+
+ @Override
+ public void validateName(String inputName) {
+ throw new UnsupportedOperationException();
+ }
+
+ protected abstract Project getProject();
+
+ @Nullable
+ protected abstract IssueQuery getIssueQuery();
+
+ protected abstract Iterator<? extends Issue> getIssueIterator();
+
+ protected abstract int getIssueCount();
+
+ protected abstract void onUpdated(AjaxRequestTarget target);
+
+ protected abstract void onCancel(AjaxRequestTarget target);
+
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
index 79a8660020..02f0b9b443 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
@@ -55,9 +55,9 @@ import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.support.setting.GlobalIssueSetting;
import io.onedev.server.search.entity.issue.IssueQuery;
-import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
import io.onedev.server.util.Input;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.facade.UserFacade;
import io.onedev.server.util.userident.UserIdent;
import io.onedev.server.web.WebConstants;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java
index fa576d8e06..1faae01575 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java
@@ -39,10 +39,10 @@ import io.onedev.server.model.support.issue.TransitionSpec;
import io.onedev.server.model.support.issue.transitiontrigger.PressButtonTrigger;
import io.onedev.server.model.support.setting.GlobalIssueSetting;
import io.onedev.server.search.entity.issue.IssueQuery;
-import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.IssueConstants;
import io.onedev.server.util.Input;
import io.onedev.server.util.IssueUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.util.inputspec.choiceinput.ChoiceInput;
import io.onedev.server.util.inputspec.dateinput.DateInput;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/pullrequests/IssuePullRequestsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/pullrequests/IssuePullRequestsPanel.java
index 571e4d386c..04b1df510a 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/pullrequests/IssuePullRequestsPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/pullrequests/IssuePullRequestsPanel.java
@@ -26,7 +26,7 @@ import io.onedev.server.cache.CommitInfoManager;
import io.onedev.server.entitymanager.PullRequestManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.PullRequest;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.component.pullrequest.RequestStatusLabel;
import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java
index 1ed12e4241..fc6b5bd2b7 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java
@@ -52,9 +52,9 @@ import io.onedev.server.model.User;
import io.onedev.server.model.support.EntityWatch;
import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.issue.IssueQuery;
-import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.Input;
import io.onedev.server.util.IssueUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.facade.UserFacade;
import io.onedev.server.util.userident.UserIdent;
import io.onedev.server.web.ajaxlistener.AppendLoadingIndicatorListener;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.java
index d468cf17b7..4e38cd7af5 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.java
@@ -18,7 +18,7 @@ import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.IssueChangeManager;
import io.onedev.server.model.Issue;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;
@SuppressWarnings("serial")
diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/JobDefLink.java b/server-core/src/main/java/io/onedev/server/web/component/job/JobDefLink.java
index c8a17d82bc..cecc04620b 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/job/JobDefLink.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/job/JobDefLink.java
@@ -11,7 +11,7 @@ import io.onedev.server.ci.CISpec;
import io.onedev.server.ci.job.Job;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.model.Project;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.model.EntityModel;
import io.onedev.server.web.page.project.blob.ProjectBlobPage;
import io.onedev.server.web.page.project.blob.render.renderers.cispec.CISpecRendererProvider;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java b/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java
index 4231193a49..3a452d9bde 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java
@@ -20,7 +20,7 @@ import io.onedev.server.ci.job.JobManager;
import io.onedev.server.ci.job.param.JobParam;
import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.inputspec.InputContext;
import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.web.component.beaneditmodal.BeanEditModalPanel;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/milestone/closelink/MilestoneCloseLink.java b/server-core/src/main/java/io/onedev/server/web/component/milestone/closelink/MilestoneCloseLink.java
index f44e2530b3..12f36aef23 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/milestone/closelink/MilestoneCloseLink.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/milestone/closelink/MilestoneCloseLink.java
@@ -9,7 +9,7 @@ import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.IssueManager;
import io.onedev.server.model.Milestone;
import io.onedev.server.model.support.issue.StateSpec;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.component.modal.ModalLink;
import io.onedev.server.web.component.modal.ModalPanel;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/milestone/deletelink/MilestoneDeleteLink.java b/server-core/src/main/java/io/onedev/server/web/component/milestone/deletelink/MilestoneDeleteLink.java
index 53cebe73c8..0026cc56ca 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/milestone/deletelink/MilestoneDeleteLink.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/milestone/deletelink/MilestoneDeleteLink.java
@@ -8,7 +8,7 @@ import org.apache.wicket.markup.head.IHeaderResponse;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.IssueManager;
import io.onedev.server.model.Milestone;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.component.milestone.closelink.MilestoneCloseLinkCssResourceReference;
import io.onedev.server.web.component.modal.ModalLink;
import io.onedev.server.web.component.modal.ModalPanel;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/ProjectLink.java b/server-core/src/main/java/io/onedev/server/web/component/project/ProjectLink.java
index a78603de9f..9dddb2d450 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/ProjectLink.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/ProjectLink.java
@@ -3,7 +3,7 @@ package io.onedev.server.web.component.project;
import org.apache.wicket.Page;
import io.onedev.server.model.Project;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.page.project.ProjectPage;
import io.onedev.server.web.page.project.blob.ProjectBlobPage;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/comment/CommentInput.java b/server-core/src/main/java/io/onedev/server/web/component/project/comment/CommentInput.java
index c8e64544fb..f06b316bbe 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/comment/CommentInput.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/comment/CommentInput.java
@@ -16,8 +16,8 @@ import io.onedev.server.model.Build;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
-import io.onedev.server.security.SecurityUtils;
import io.onedev.server.security.permission.ProjectPrivilege;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.facade.UserFacade;
import io.onedev.server.web.component.markdown.AtWhoReferenceSupport;
import io.onedev.server.web.component.markdown.MarkdownEditor;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/review/ReviewListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/review/ReviewListPanel.java
index 7f1df29331..c534f5b2fa 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/review/ReviewListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/review/ReviewListPanel.java
@@ -30,7 +30,7 @@ import io.onedev.server.entitymanager.PullRequestReviewManager;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestReview;
import io.onedev.server.model.support.pullrequest.ReviewResult;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.facade.UserFacade;
import io.onedev.server.util.markdown.MarkdownManager;
import io.onedev.server.util.userident.UserIdent;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/review/ReviewerProvider.java b/server-core/src/main/java/io/onedev/server/web/component/review/ReviewerProvider.java
index 8371de2806..b9a5580f32 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/review/ReviewerProvider.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/review/ReviewerProvider.java
@@ -11,8 +11,8 @@ import io.onedev.commons.utils.matchscore.MatchScoreProvider;
import io.onedev.commons.utils.matchscore.MatchScoreUtils;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestReview;
-import io.onedev.server.security.SecurityUtils;
import io.onedev.server.security.permission.ProjectPrivilege;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.facade.UserFacade;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.component.select2.Response;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionSelector.java b/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionSelector.java
index b5749ac6b1..154520b7a8 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionSelector.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionSelector.java
@@ -44,7 +44,7 @@ import io.onedev.commons.utils.ExceptionUtils;
import io.onedev.server.git.GitUtils;
import io.onedev.server.git.RefInfo;
import io.onedev.server.model.Project;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
import io.onedev.server.web.behavior.InputChangeBehavior;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/passwordedit/PasswordEditPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/passwordedit/PasswordEditPanel.java
index 275a949fea..0208b7f71d 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/passwordedit/PasswordEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/passwordedit/PasswordEditPanel.java
@@ -13,7 +13,7 @@ import io.onedev.commons.launcher.loader.AppLoader;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.model.User;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.editable.BeanContext;
@SuppressWarnings("serial")
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.java
index 362c663a3d..484ac735a9 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.java
@@ -16,7 +16,7 @@ import io.onedev.server.OneDev;
import io.onedev.server.OneException;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.model.User;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.editable.BeanEditor;
import io.onedev.server.web.editable.PathElement;
diff --git a/server-core/src/main/java/io/onedev/server/web/download/ArchiveDownloadResource.java b/server-core/src/main/java/io/onedev/server/web/download/ArchiveDownloadResource.java
index 94e3f852fd..357b4e5ab7 100644
--- a/server-core/src/main/java/io/onedev/server/web/download/ArchiveDownloadResource.java
+++ b/server-core/src/main/java/io/onedev/server/web/download/ArchiveDownloadResource.java
@@ -22,7 +22,7 @@ import com.google.common.base.Charsets;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.model.Project;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
public class ArchiveDownloadResource extends AbstractResource {
diff --git a/server-core/src/main/java/io/onedev/server/web/download/AttachmentDownloadResource.java b/server-core/src/main/java/io/onedev/server/web/download/AttachmentDownloadResource.java
index 73fdc506e1..e0964f5e5c 100644
--- a/server-core/src/main/java/io/onedev/server/web/download/AttachmentDownloadResource.java
+++ b/server-core/src/main/java/io/onedev/server/web/download/AttachmentDownloadResource.java
@@ -17,8 +17,8 @@ import org.apache.wicket.request.resource.AbstractResource;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.model.Project;
-import io.onedev.server.security.SecurityUtils;
import io.onedev.server.storage.AttachmentStorageManager;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.facade.ProjectFacade;
public class AttachmentDownloadResource extends AbstractResource {
diff --git a/server-core/src/main/java/io/onedev/server/web/download/BuildLogDownloadResource.java b/server-core/src/main/java/io/onedev/server/web/download/BuildLogDownloadResource.java
index 41599e1a11..e605dac049 100644
--- a/server-core/src/main/java/io/onedev/server/web/download/BuildLogDownloadResource.java
+++ b/server-core/src/main/java/io/onedev/server/web/download/BuildLogDownloadResource.java
@@ -22,7 +22,7 @@ import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
public class BuildLogDownloadResource extends AbstractResource {
diff --git a/server-core/src/main/java/io/onedev/server/web/download/RawBlobDownloadResource.java b/server-core/src/main/java/io/onedev/server/web/download/RawBlobDownloadResource.java
index f4ef91b91e..252a22d75f 100644
--- a/server-core/src/main/java/io/onedev/server/web/download/RawBlobDownloadResource.java
+++ b/server-core/src/main/java/io/onedev/server/web/download/RawBlobDownloadResource.java
@@ -26,7 +26,7 @@ import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.git.Blob;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.model.Project;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
public class RawBlobDownloadResource extends AbstractResource {
diff --git a/server-core/src/main/java/io/onedev/server/web/download/ServerLogDownloadResource.java b/server-core/src/main/java/io/onedev/server/web/download/ServerLogDownloadResource.java
index d2e31916bf..dc20940942 100644
--- a/server-core/src/main/java/io/onedev/server/web/download/ServerLogDownloadResource.java
+++ b/server-core/src/main/java/io/onedev/server/web/download/ServerLogDownloadResource.java
@@ -13,7 +13,7 @@ import org.apache.wicket.request.resource.AbstractResource;
import io.onedev.commons.launcher.bootstrap.Bootstrap;
import io.onedev.commons.utils.FileUtils;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
import com.google.common.base.Charsets;
import com.google.common.base.Joiner;
diff --git a/server-core/src/main/java/io/onedev/server/web/model/AffinalProjectsModel.java b/server-core/src/main/java/io/onedev/server/web/model/AffinalProjectsModel.java
index 2236ffa4ac..03ebd4b3b0 100644
--- a/server-core/src/main/java/io/onedev/server/web/model/AffinalProjectsModel.java
+++ b/server-core/src/main/java/io/onedev/server/web/model/AffinalProjectsModel.java
@@ -9,7 +9,7 @@ import org.apache.wicket.model.LoadableDetachableModel;
import io.onedev.server.OneDev;
import io.onedev.server.model.Project;
import io.onedev.server.persistence.dao.Dao;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
@SuppressWarnings("serial")
public class AffinalProjectsModel extends LoadableDetachableModel<Collection<Project>> {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/AdministrationPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/AdministrationPage.java
index 27b54cd3bc..cc0206b169 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/AdministrationPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/AdministrationPage.java
@@ -4,7 +4,7 @@ import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.page.layout.LayoutPage;
@SuppressWarnings("serial")
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.java
index 3438038610..98f24688bc 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.java
@@ -33,7 +33,7 @@ import io.onedev.server.OneException;
import io.onedev.server.entitymanager.GroupManager;
import io.onedev.server.model.Group;
import io.onedev.server.persistence.dao.EntityCriteria;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.behavior.OnTypingDoneBehavior;
import io.onedev.server.web.component.datatable.HistoryAwareDataTable;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupMembershipsPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupMembershipsPage.java
index 9d0eb07772..cf23af9c69 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupMembershipsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupMembershipsPage.java
@@ -42,7 +42,7 @@ import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.model.Membership;
import io.onedev.server.model.User;
import io.onedev.server.persistence.dao.EntityCriteria;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.facade.MembershipFacade;
import io.onedev.server.util.facade.UserFacade;
import io.onedev.server.web.WebConstants;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupPage.java
index d20958f761..3e9a4ab7b4 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupPage.java
@@ -14,7 +14,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.unbescape.html.HtmlEscape;
import io.onedev.server.model.Group;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.component.floating.AlignPlacement;
import io.onedev.server.web.component.floating.FloatingPanel;
import io.onedev.server.web.component.link.DropdownLink;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupProfilePage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupProfilePage.java
index 0dfe6fae26..62a73e2eaf 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupProfilePage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupProfilePage.java
@@ -21,7 +21,7 @@ import io.onedev.server.OneDev;
import io.onedev.server.OneException;
import io.onedev.server.entitymanager.GroupManager;
import io.onedev.server.model.Group;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.editable.BeanDescriptor;
import io.onedev.server.web.editable.BeanEditor;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/NewGroupPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/group/NewGroupPage.java
index dd53c4dcb7..d207c07eae 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/group/NewGroupPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/group/NewGroupPage.java
@@ -15,7 +15,7 @@ import com.google.common.collect.Sets;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.GroupManager;
import io.onedev.server.model.Group;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.editable.BeanEditor;
import io.onedev.server.web.editable.PathElement;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.java
index df220157c8..855967942c 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.java
@@ -34,7 +34,7 @@ import io.onedev.server.OneException;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.model.User;
import io.onedev.server.persistence.dao.EntityCriteria;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.facade.UserFacade;
import io.onedev.server.util.userident.UserIdent;
import io.onedev.server.web.WebConstants;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/init/ServerInitPage.java b/server-core/src/main/java/io/onedev/server/web/page/init/ServerInitPage.java
index 493ab26cb5..a01569c8ae 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/init/ServerInitPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/init/ServerInitPage.java
@@ -18,7 +18,7 @@ import io.onedev.commons.utils.init.Skippable;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.model.User;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.WebSession;
import io.onedev.server.web.component.wizard.ManualConfigStep;
import io.onedev.server.web.component.wizard.Wizard;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
index a698dfb7a8..4c879ea705 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
@@ -1,245 +1,245 @@
-package io.onedev.server.web.page.layout;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.RestartResponseAtInterceptPageException;
-import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.link.ExternalLink;
-import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.markup.repeater.RepeatingView;
-import org.apache.wicket.protocol.http.ClientProperties;
-import org.apache.wicket.protocol.http.request.WebClientInfo;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-
-import io.onedev.commons.launcher.loader.AppLoader;
-import io.onedev.commons.launcher.loader.Plugin;
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.SettingManager;
-import io.onedev.server.model.User;
-import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.util.facade.UserFacade;
-import io.onedev.server.util.userident.UserIdent;
-import io.onedev.server.web.component.link.ViewStateAwarePageLink;
-import io.onedev.server.web.component.user.avatar.UserAvatar;
-import io.onedev.server.web.page.admin.AdministrationPage;
-import io.onedev.server.web.page.admin.authenticator.AuthenticatorPage;
-import io.onedev.server.web.page.admin.databasebackup.DatabaseBackupPage;
-import io.onedev.server.web.page.admin.group.GroupListPage;
-import io.onedev.server.web.page.admin.group.GroupPage;
-import io.onedev.server.web.page.admin.group.NewGroupPage;
-import io.onedev.server.web.page.admin.issuesetting.GlobalIssueSettingPage;
-import io.onedev.server.web.page.admin.issuesetting.IssueFieldListPage;
-import io.onedev.server.web.page.admin.jobexecutor.JobExecutorPage;
-import io.onedev.server.web.page.admin.mailsetting.MailSettingPage;
-import io.onedev.server.web.page.admin.securitysetting.SecuritySettingPage;
-import io.onedev.server.web.page.admin.serverinformation.ServerInformationPage;
-import io.onedev.server.web.page.admin.serverlog.ServerLogPage;
-import io.onedev.server.web.page.admin.systemsetting.SystemSettingPage;
-import io.onedev.server.web.page.admin.user.NewUserPage;
-import io.onedev.server.web.page.admin.user.UserListPage;
-import io.onedev.server.web.page.admin.user.UserPage;
-import io.onedev.server.web.page.base.BasePage;
-import io.onedev.server.web.page.my.MyAvatarPage;
-import io.onedev.server.web.page.my.MyPage;
-import io.onedev.server.web.page.my.MyPasswordPage;
-import io.onedev.server.web.page.my.MyProfilePage;
-import io.onedev.server.web.page.my.MyTokenPage;
-import io.onedev.server.web.page.project.NewProjectPage;
-import io.onedev.server.web.page.project.ProjectListPage;
-import io.onedev.server.web.page.project.ProjectPage;
-import io.onedev.server.web.page.security.LoginPage;
-import io.onedev.server.web.page.security.LogoutPage;
-import io.onedev.server.web.page.security.RegisterPage;
-
-@SuppressWarnings("serial")
-public abstract class LayoutPage extends BasePage {
-
- private final ClientProperties clientProperties;
-
- public LayoutPage(PageParameters params) {
- super(params);
- clientProperties = ((WebClientInfo)getSession().getClientInfo()).getProperties();
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- User loginUser = getLoginUser();
-
- add(newNavContext("navContext"));
-
- WebMarkupContainer projectsContainer = new WebMarkupContainer("navProjects");
- projectsContainer.add(new ViewStateAwarePageLink<Void>("link", ProjectListPage.class));
- if (getPage() instanceof ProjectListPage || getPage() instanceof ProjectPage || getPage() instanceof NewProjectPage)
- projectsContainer.add(AttributeAppender.append("class", "active"));
- add(projectsContainer);
-
- RepeatingView contributionsView = new RepeatingView("navContributions");
- List<MainNavContribution> contributions = new ArrayList<>();
- for (MainNavContribution contribution: OneDev.getExtensions(MainNavContribution.class)) {
- if (contribution.isAuthorized())
- contributions.add(contribution);
- }
- Collections.sort(contributions, new Comparator<MainNavContribution>() {
-
- @Override
- public int compare(MainNavContribution o1, MainNavContribution o2) {
- return o1.getOrder() - o2.getOrder();
- }
-
- });
- for (MainNavContribution contribution: contributions) {
- WebMarkupContainer contributionContainer = new WebMarkupContainer(contributionsView.newChildId());
- Link<Void> link = new ViewStateAwarePageLink<Void>("link", contribution.getPageClass());
- link.add(new Label("label", contribution.getLabel()));
- contributionContainer.add(link);
- if (contribution.isActive((LayoutPage) getPage()))
- contributionContainer.add(AttributeAppender.append("class", "active"));
- contributionsView.add(contributionContainer);
- }
- add(contributionsView);
-
- WebMarkupContainer administrationContainer = new WebMarkupContainer("navAdministration");
- WebMarkupContainer item;
-
- administrationContainer.add(item = new WebMarkupContainer("userManagement"));
- item.add(new ViewStateAwarePageLink<Void>("link", UserListPage.class));
- if (getPage() instanceof UserListPage || getPage() instanceof NewUserPage || getPage() instanceof UserPage)
- item.add(AttributeAppender.append("class", "active"));
-
- administrationContainer.add(item = new WebMarkupContainer("groupManagement"));
- item.add(new ViewStateAwarePageLink<Void>("link", GroupListPage.class));
- if (getPage() instanceof GroupListPage || getPage() instanceof NewGroupPage || getPage() instanceof GroupPage)
- item.add(AttributeAppender.append("class", "active"));
-
- administrationContainer.add(item = new WebMarkupContainer("securitySetting"));
- item.add(new ViewStateAwarePageLink<Void>("link", SecuritySettingPage.class));
- if (getPage() instanceof SecuritySettingPage)
- item.add(AttributeAppender.append("class", "active"));
-
- administrationContainer.add(item = new WebMarkupContainer("externelAuthentication"));
- item.add(new ViewStateAwarePageLink<Void>("link", AuthenticatorPage.class));
- if (getPage() instanceof AuthenticatorPage)
- item.add(AttributeAppender.append("class", "active"));
-
- administrationContainer.add(item = new WebMarkupContainer("jobExecutors"));
- item.add(new ViewStateAwarePageLink<Void>("link", JobExecutorPage.class));
- if (getPage() instanceof JobExecutorPage)
- item.add(AttributeAppender.append("class", "active"));
-
- administrationContainer.add(item = new WebMarkupContainer("systemSetting"));
- item.add(new ViewStateAwarePageLink<Void>("link", SystemSettingPage.class));
- if (getPage() instanceof SystemSettingPage)
- item.add(AttributeAppender.append("class", "active"));
-
- administrationContainer.add(item = new WebMarkupContainer("issueSetting"));
- item.add(new ViewStateAwarePageLink<Void>("link", IssueFieldListPage.class));
- if (getPage() instanceof GlobalIssueSettingPage)
- item.add(AttributeAppender.append("class", "active"));
-
- administrationContainer.add(item = new WebMarkupContainer("mailSetting"));
- item.add(new ViewStateAwarePageLink<Void>("link", MailSettingPage.class));
- if (getPage() instanceof MailSettingPage)
- item.add(AttributeAppender.append("class", "active"));
-
- administrationContainer.add(item = new WebMarkupContainer("databaseBackup"));
- item.add(new ViewStateAwarePageLink<Void>("link", DatabaseBackupPage.class));
- if (getPage() instanceof DatabaseBackupPage)
- item.add(AttributeAppender.append("class", "active"));
-
- administrationContainer.add(item = new WebMarkupContainer("serverLog"));
- item.add(new ViewStateAwarePageLink<Void>("link", ServerLogPage.class));
- if (getPage() instanceof ServerLogPage)
- item.add(AttributeAppender.append("class", "active"));
-
- administrationContainer.add(item = new WebMarkupContainer("serverInformation"));
- item.add(new ViewStateAwarePageLink<Void>("link", ServerInformationPage.class));
- if (getPage() instanceof ServerInformationPage)
- item.add(AttributeAppender.append("class", "active"));
-
- if (getPage() instanceof AdministrationPage)
- administrationContainer.add(AttributeAppender.append("class", "active"));
- administrationContainer.setVisible(SecurityUtils.isAdministrator());
- add(administrationContainer);
-
- Plugin product = AppLoader.getProduct();
- add(new Label("productVersion", product.getVersion()));
- add(new ExternalLink("docLink", OneDev.getInstance().getDocRoot() + "/"));
-
- WebMarkupContainer notSignedInContainer = new WebMarkupContainer("notSignedIn");
- notSignedInContainer.add(new Link<Void>("signIn") {
-
- @Override
- public void onClick() {
- throw new RestartResponseAtInterceptPageException(LoginPage.class);
- }
-
- });
-
- boolean enableSelfRegister = OneDev.getInstance(SettingManager.class).getSecuritySetting().isEnableSelfRegister();
- notSignedInContainer.add(new ViewStateAwarePageLink<Void>("signUp", RegisterPage.class).setVisible(enableSelfRegister));
- notSignedInContainer.setVisible(loginUser == null);
- add(notSignedInContainer);
-
- WebMarkupContainer signedInContainer = new WebMarkupContainer("navSignedIn");
- signedInContainer.add(new UserAvatar("avatar", UserIdent.of(UserFacade.of(loginUser))));
- signedInContainer.add(new Label("name", loginUser!=null?loginUser.getDisplayName():""));
- signedInContainer.add(new Label("header", loginUser!=null?loginUser.getDisplayName():""));
-
- signedInContainer.add(item = new WebMarkupContainer("myProfile"));
- item.add(new ViewStateAwarePageLink<Void>("link", MyProfilePage.class));
- if (getPage() instanceof MyProfilePage)
- item.add(AttributeAppender.append("class", "active"));
-
- signedInContainer.add(item = new WebMarkupContainer("myAvatar"));
- item.add(new ViewStateAwarePageLink<Void>("link", MyAvatarPage.class));
- if (getPage() instanceof MyAvatarPage)
- item.add(AttributeAppender.append("class", "active"));
-
- signedInContainer.add(item = new WebMarkupContainer("myPassword"));
- item.add(new ViewStateAwarePageLink<Void>("link", MyPasswordPage.class));
- if (getPage() instanceof MyPasswordPage)
- item.add(AttributeAppender.append("class", "active"));
-
- signedInContainer.add(item = new WebMarkupContainer("myAccessToken"));
- item.add(new ViewStateAwarePageLink<Void>("link", MyTokenPage.class));
- if (getPage() instanceof MyTokenPage)
- item.add(AttributeAppender.append("class", "active"));
-
- signedInContainer.add(new ViewStateAwarePageLink<Void>("signOut", LogoutPage.class));
- signedInContainer.setVisible(loginUser != null);
- if (getPage() instanceof MyPage)
- signedInContainer.add(AttributeAppender.append("class", "active"));
-
- add(signedInContainer);
- }
-
- @Override
- protected boolean isPermitted() {
- return getLoginUser() != null || OneDev.getInstance(SettingManager.class).getSecuritySetting().isEnableAnonymousAccess();
- }
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new LayoutResourceReference()));
- }
-
- protected Component newNavContext(String componentId) {
- return new WebMarkupContainer(componentId);
- }
-
- public ClientProperties getClientProperties() {
- return clientProperties;
- }
-
-}
+package io.onedev.server.web.page.layout;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.RestartResponseAtInterceptPageException;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.ExternalLink;
+import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.markup.repeater.RepeatingView;
+import org.apache.wicket.protocol.http.ClientProperties;
+import org.apache.wicket.protocol.http.request.WebClientInfo;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+import io.onedev.commons.launcher.loader.AppLoader;
+import io.onedev.commons.launcher.loader.Plugin;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.model.User;
+import io.onedev.server.util.SecurityUtils;
+import io.onedev.server.util.facade.UserFacade;
+import io.onedev.server.util.userident.UserIdent;
+import io.onedev.server.web.component.link.ViewStateAwarePageLink;
+import io.onedev.server.web.component.user.avatar.UserAvatar;
+import io.onedev.server.web.page.admin.AdministrationPage;
+import io.onedev.server.web.page.admin.authenticator.AuthenticatorPage;
+import io.onedev.server.web.page.admin.databasebackup.DatabaseBackupPage;
+import io.onedev.server.web.page.admin.group.GroupListPage;
+import io.onedev.server.web.page.admin.group.GroupPage;
+import io.onedev.server.web.page.admin.group.NewGroupPage;
+import io.onedev.server.web.page.admin.issuesetting.GlobalIssueSettingPage;
+import io.onedev.server.web.page.admin.issuesetting.IssueFieldListPage;
+import io.onedev.server.web.page.admin.jobexecutor.JobExecutorPage;
+import io.onedev.server.web.page.admin.mailsetting.MailSettingPage;
+import io.onedev.server.web.page.admin.securitysetting.SecuritySettingPage;
+import io.onedev.server.web.page.admin.serverinformation.ServerInformationPage;
+import io.onedev.server.web.page.admin.serverlog.ServerLogPage;
+import io.onedev.server.web.page.admin.systemsetting.SystemSettingPage;
+import io.onedev.server.web.page.admin.user.NewUserPage;
+import io.onedev.server.web.page.admin.user.UserListPage;
+import io.onedev.server.web.page.admin.user.UserPage;
+import io.onedev.server.web.page.base.BasePage;
+import io.onedev.server.web.page.my.MyAvatarPage;
+import io.onedev.server.web.page.my.MyPage;
+import io.onedev.server.web.page.my.MyPasswordPage;
+import io.onedev.server.web.page.my.MyProfilePage;
+import io.onedev.server.web.page.my.MyTokenPage;
+import io.onedev.server.web.page.project.NewProjectPage;
+import io.onedev.server.web.page.project.ProjectListPage;
+import io.onedev.server.web.page.project.ProjectPage;
+import io.onedev.server.web.page.security.LoginPage;
+import io.onedev.server.web.page.security.LogoutPage;
+import io.onedev.server.web.page.security.RegisterPage;
+
+@SuppressWarnings("serial")
+public abstract class LayoutPage extends BasePage {
+
+ private final ClientProperties clientProperties;
+
+ public LayoutPage(PageParameters params) {
+ super(params);
+ clientProperties = ((WebClientInfo)getSession().getClientInfo()).getProperties();
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ User loginUser = getLoginUser();
+
+ add(newNavContext("navContext"));
+
+ WebMarkupContainer projectsContainer = new WebMarkupContainer("navProjects");
+ projectsContainer.add(new ViewStateAwarePageLink<Void>("link", ProjectListPage.class));
+ if (getPage() instanceof ProjectListPage || getPage() instanceof ProjectPage || getPage() instanceof NewProjectPage)
+ projectsContainer.add(AttributeAppender.append("class", "active"));
+ add(projectsContainer);
+
+ RepeatingView contributionsView = new RepeatingView("navContributions");
+ List<MainNavContribution> contributions = new ArrayList<>();
+ for (MainNavContribution contribution: OneDev.getExtensions(MainNavContribution.class)) {
+ if (contribution.isAuthorized())
+ contributions.add(contribution);
+ }
+ Collections.sort(contributions, new Comparator<MainNavContribution>() {
+
+ @Override
+ public int compare(MainNavContribution o1, MainNavContribution o2) {
+ return o1.getOrder() - o2.getOrder();
+ }
+
+ });
+ for (MainNavContribution contribution: contributions) {
+ WebMarkupContainer contributionContainer = new WebMarkupContainer(contributionsView.newChildId());
+ Link<Void> link = new ViewStateAwarePageLink<Void>("link", contribution.getPageClass());
+ link.add(new Label("label", contribution.getLabel()));
+ contributionContainer.add(link);
+ if (contribution.isActive((LayoutPage) getPage()))
+ contributionContainer.add(AttributeAppender.append("class", "active"));
+ contributionsView.add(contributionContainer);
+ }
+ add(contributionsView);
+
+ WebMarkupContainer administrationContainer = new WebMarkupContainer("navAdministration");
+ WebMarkupContainer item;
+
+ administrationContainer.add(item = new WebMarkupContainer("userManagement"));
+ item.add(new ViewStateAwarePageLink<Void>("link", UserListPage.class));
+ if (getPage() instanceof UserListPage || getPage() instanceof NewUserPage || getPage() instanceof UserPage)
+ item.add(AttributeAppender.append("class", "active"));
+
+ administrationContainer.add(item = new WebMarkupContainer("groupManagement"));
+ item.add(new ViewStateAwarePageLink<Void>("link", GroupListPage.class));
+ if (getPage() instanceof GroupListPage || getPage() instanceof NewGroupPage || getPage() instanceof GroupPage)
+ item.add(AttributeAppender.append("class", "active"));
+
+ administrationContainer.add(item = new WebMarkupContainer("securitySetting"));
+ item.add(new ViewStateAwarePageLink<Void>("link", SecuritySettingPage.class));
+ if (getPage() instanceof SecuritySettingPage)
+ item.add(AttributeAppender.append("class", "active"));
+
+ administrationContainer.add(item = new WebMarkupContainer("externelAuthentication"));
+ item.add(new ViewStateAwarePageLink<Void>("link", AuthenticatorPage.class));
+ if (getPage() instanceof AuthenticatorPage)
+ item.add(AttributeAppender.append("class", "active"));
+
+ administrationContainer.add(item = new WebMarkupContainer("jobExecutors"));
+ item.add(new ViewStateAwarePageLink<Void>("link", JobExecutorPage.class));
+ if (getPage() instanceof JobExecutorPage)
+ item.add(AttributeAppender.append("class", "active"));
+
+ administrationContainer.add(item = new WebMarkupContainer("systemSetting"));
+ item.add(new ViewStateAwarePageLink<Void>("link", SystemSettingPage.class));
+ if (getPage() instanceof SystemSettingPage)
+ item.add(AttributeAppender.append("class", "active"));
+
+ administrationContainer.add(item = new WebMarkupContainer("issueSetting"));
+ item.add(new ViewStateAwarePageLink<Void>("link", IssueFieldListPage.class));
+ if (getPage() instanceof GlobalIssueSettingPage)
+ item.add(AttributeAppender.append("class", "active"));
+
+ administrationContainer.add(item = new WebMarkupContainer("mailSetting"));
+ item.add(new ViewStateAwarePageLink<Void>("link", MailSettingPage.class));
+ if (getPage() instanceof MailSettingPage)
+ item.add(AttributeAppender.append("class", "active"));
+
+ administrationContainer.add(item = new WebMarkupContainer("databaseBackup"));
+ item.add(new ViewStateAwarePageLink<Void>("link", DatabaseBackupPage.class));
+ if (getPage() instanceof DatabaseBackupPage)
+ item.add(AttributeAppender.append("class", "active"));
+
+ administrationContainer.add(item = new WebMarkupContainer("serverLog"));
+ item.add(new ViewStateAwarePageLink<Void>("link", ServerLogPage.class));
+ if (getPage() instanceof ServerLogPage)
+ item.add(AttributeAppender.append("class", "active"));
+
+ administrationContainer.add(item = new WebMarkupContainer("serverInformation"));
+ item.add(new ViewStateAwarePageLink<Void>("link", ServerInformationPage.class));
+ if (getPage() instanceof ServerInformationPage)
+ item.add(AttributeAppender.append("class", "active"));
+
+ if (getPage() instanceof AdministrationPage)
+ administrationContainer.add(AttributeAppender.append("class", "active"));
+ administrationContainer.setVisible(SecurityUtils.isAdministrator());
+ add(administrationContainer);
+
+ Plugin product = AppLoader.getProduct();
+ add(new Label("productVersion", product.getVersion()));
+ add(new ExternalLink("docLink", OneDev.getInstance().getDocRoot() + "/"));
+
+ WebMarkupContainer notSignedInContainer = new WebMarkupContainer("notSignedIn");
+ notSignedInContainer.add(new Link<Void>("signIn") {
+
+ @Override
+ public void onClick() {
+ throw new RestartResponseAtInterceptPageException(LoginPage.class);
+ }
+
+ });
+
+ boolean enableSelfRegister = OneDev.getInstance(SettingManager.class).getSecuritySetting().isEnableSelfRegister();
+ notSignedInContainer.add(new ViewStateAwarePageLink<Void>("signUp", RegisterPage.class).setVisible(enableSelfRegister));
+ notSignedInContainer.setVisible(loginUser == null);
+ add(notSignedInContainer);
+
+ WebMarkupContainer signedInContainer = new WebMarkupContainer("navSignedIn");
+ signedInContainer.add(new UserAvatar("avatar", UserIdent.of(UserFacade.of(loginUser))));
+ signedInContainer.add(new Label("name", loginUser!=null?loginUser.getDisplayName():""));
+ signedInContainer.add(new Label("header", loginUser!=null?loginUser.getDisplayName():""));
+
+ signedInContainer.add(item = new WebMarkupContainer("myProfile"));
+ item.add(new ViewStateAwarePageLink<Void>("link", MyProfilePage.class));
+ if (getPage() instanceof MyProfilePage)
+ item.add(AttributeAppender.append("class", "active"));
+
+ signedInContainer.add(item = new WebMarkupContainer("myAvatar"));
+ item.add(new ViewStateAwarePageLink<Void>("link", MyAvatarPage.class));
+ if (getPage() instanceof MyAvatarPage)
+ item.add(AttributeAppender.append("class", "active"));
+
+ signedInContainer.add(item = new WebMarkupContainer("myPassword"));
+ item.add(new ViewStateAwarePageLink<Void>("link", MyPasswordPage.class));
+ if (getPage() instanceof MyPasswordPage)
+ item.add(AttributeAppender.append("class", "active"));
+
+ signedInContainer.add(item = new WebMarkupContainer("myAccessToken"));
+ item.add(new ViewStateAwarePageLink<Void>("link", MyTokenPage.class));
+ if (getPage() instanceof MyTokenPage)
+ item.add(AttributeAppender.append("class", "active"));
+
+ signedInContainer.add(new ViewStateAwarePageLink<Void>("signOut", LogoutPage.class));
+ signedInContainer.setVisible(loginUser != null);
+ if (getPage() instanceof MyPage)
+ signedInContainer.add(AttributeAppender.append("class", "active"));
+
+ add(signedInContainer);
+ }
+
+ @Override
+ protected boolean isPermitted() {
+ return getLoginUser() != null || OneDev.getInstance(SettingManager.class).getSecuritySetting().isEnableAnonymousAccess();
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(CssHeaderItem.forReference(new LayoutResourceReference()));
+ }
+
+ protected Component newNavContext(String componentId) {
+ return new WebMarkupContainer(componentId);
+ }
+
+ public ClientProperties getClientProperties() {
+ return clientProperties;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.java
index 030b83450d..899a0cc7f6 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.java
@@ -11,7 +11,7 @@ import com.google.common.collect.Lists;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.model.Project;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.editable.BeanEditor;
import io.onedev.server.web.editable.PathElement;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/NoCommitsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/NoCommitsPage.java
index b07adaabbb..98dee6772b 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/NoCommitsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/NoCommitsPage.java
@@ -4,7 +4,7 @@ import org.apache.wicket.RestartResponseException;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.page.project.blob.ProjectBlobPage;
import io.onedev.server.web.page.project.issues.list.IssueListPage;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java
index 5772df380e..1491f9fe3d 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java
@@ -26,8 +26,8 @@ import io.onedev.commons.utils.matchscore.MatchScoreUtils;
import io.onedev.server.OneDev;
import io.onedev.server.cache.CacheManager;
import io.onedev.server.entitymanager.ProjectManager;
-import io.onedev.server.security.SecurityUtils;
import io.onedev.server.security.permission.ProjectPrivilege;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.facade.GroupAuthorizationFacade;
import io.onedev.server.util.facade.ProjectFacade;
import io.onedev.server.util.facade.UserAuthorizationFacade;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java
index 8c05ec5d88..b4cddda03b 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java
@@ -32,7 +32,7 @@ import io.onedev.server.OneException;
import io.onedev.server.cache.UserInfoManager;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.model.Project;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.component.floating.AlignPlacement;
import io.onedev.server.web.component.floating.FloatingPanel;
import io.onedev.server.web.component.link.DropdownLink;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java
index e76992ee5a..7b037e1755 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java
@@ -78,7 +78,7 @@ import io.onedev.server.search.code.SearchManager;
import io.onedev.server.search.code.hit.QueryHit;
import io.onedev.server.search.code.query.BlobQuery;
import io.onedev.server.search.code.query.TextQuery;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.PrioritizedComponentRenderer;
import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
import io.onedev.server.web.component.floating.FloatingPanel;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java
index b1f5e9d33d..5e00c0464a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java
@@ -58,7 +58,7 @@ import io.onedev.server.git.exception.ObsoleteCommitException;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.diff.WhitespaceOption;
import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
import io.onedev.server.web.ajaxlistener.TrackViewStateListener;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/LastCommitsResource.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/LastCommitsResource.java
index 39ecd1eb51..ded58b18b8 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/LastCommitsResource.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/LastCommitsResource.java
@@ -19,8 +19,8 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import io.onedev.server.OneDev;
import io.onedev.server.model.Project;
import io.onedev.server.persistence.dao.Dao;
-import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.userident.UserIdent;
import io.onedev.server.web.avatar.AvatarManager;
import io.onedev.server.web.page.project.commits.CommitDetailPage;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java
index baafe4bc4c..93667dc977 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java
@@ -1,1199 +1,1199 @@
-package io.onedev.server.web.page.project.blob.render.renderers.source;
-
-import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.annotation.Nullable;
-import javax.servlet.http.Cookie;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AjaxChannel;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes.Method;
-import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.ajax.markup.html.form.AjaxButton;
-import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.event.IEvent;
-import org.apache.wicket.extensions.markup.html.repeater.tree.ITreeProvider;
-import org.apache.wicket.extensions.markup.html.repeater.tree.NestedTree;
-import org.apache.wicket.extensions.markup.html.repeater.tree.theme.HumanTheme;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
-import org.apache.wicket.markup.head.OnLoadHeaderItem;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.form.CheckBox;
-import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.form.TextField;
-import org.apache.wicket.markup.html.panel.Fragment;
-import org.apache.wicket.model.AbstractReadOnlyModel;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.request.IRequestParameters;
-import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.request.http.WebRequest;
-import org.apache.wicket.request.http.WebResponse;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.eclipse.jgit.lib.FileMode;
-import org.eclipse.jgit.revwalk.RevCommit;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.unbescape.html.HtmlEscape;
-import org.unbescape.javascript.JavaScriptEscape;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.base.Preconditions;
-
-import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
-import io.onedev.commons.jsymbol.Symbol;
-import io.onedev.commons.jsymbol.SymbolExtractor;
-import io.onedev.commons.jsymbol.SymbolExtractorRegistry;
-import io.onedev.commons.utils.LinearRange;
-import io.onedev.commons.utils.PlanarRange;
-import io.onedev.commons.utils.StringUtils;
-import io.onedev.commons.utils.matchscore.MatchScoreProvider;
-import io.onedev.commons.utils.matchscore.MatchScoreUtils;
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.CodeCommentManager;
-import io.onedev.server.git.BlameBlock;
-import io.onedev.server.git.Blob;
-import io.onedev.server.git.BlobIdent;
-import io.onedev.server.git.GitUtils;
-import io.onedev.server.git.command.BlameCommand;
-import io.onedev.server.model.CodeComment;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.User;
-import io.onedev.server.model.support.CompareContext;
-import io.onedev.server.model.support.MarkPos;
-import io.onedev.server.model.support.ProjectAndRevision;
-import io.onedev.server.search.code.SearchManager;
-import io.onedev.server.search.code.hit.QueryHit;
-import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.util.DateUtils;
-import io.onedev.server.util.patternset.PatternSet;
-import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
-import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
-import io.onedev.server.web.behavior.blamemessage.BlameMessageBehavior;
-import io.onedev.server.web.component.codecomment.CodeCommentPanel;
-import io.onedev.server.web.component.floating.FloatingPanel;
-import io.onedev.server.web.component.link.DropdownLink;
-import io.onedev.server.web.component.link.ViewStateAwareAjaxLink;
-import io.onedev.server.web.component.menu.MenuItem;
-import io.onedev.server.web.component.modal.ModalLink;
-import io.onedev.server.web.component.modal.ModalPanel;
-import io.onedev.server.web.component.project.comment.CommentInput;
-import io.onedev.server.web.component.revisionpicker.RevisionSelector;
-import io.onedev.server.web.component.sourceformat.OptionChangeCallback;
-import io.onedev.server.web.component.sourceformat.SourceFormatPanel;
-import io.onedev.server.web.component.symboltooltip.SymbolTooltipPanel;
-import io.onedev.server.web.page.project.blob.render.BlobRenderContext;
-import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;
-import io.onedev.server.web.page.project.blob.render.view.BlobViewPanel;
-import io.onedev.server.web.page.project.blob.render.view.Positionable;
-import io.onedev.server.web.page.project.blob.search.SearchMenuContributor;
-import io.onedev.server.web.page.project.commits.CommitDetailPage;
-import io.onedev.server.web.page.project.compare.RevisionComparePage;
-import io.onedev.server.web.util.ProjectAttachmentSupport;
-import io.onedev.server.web.util.WicketUtils;
-import io.onedev.server.web.websocket.PageDataChanged;
-
-/**
- * Make sure to add only one source view panel per page
- *
- * @author robin
- *
- */
-@SuppressWarnings("serial")
-public class SourceViewPanel extends BlobViewPanel implements Positionable, SearchMenuContributor {
-
- private static final Logger logger = LoggerFactory.getLogger(SourceViewPanel.class);
-
- private static final String COOKIE_OUTLINE = "sourceView.outline";
-
- private static final String BODY_ID = "body";
-
- private final List<Symbol> symbols = new ArrayList<>();
-
- private final IModel<Map<CodeComment, PlanarRange>> commentsModel =
- new LoadableDetachableModel<Map<CodeComment, PlanarRange>>() {
-
- @Override
- protected Map<CodeComment, PlanarRange> load() {
- return OneDev.getInstance(CodeCommentManager.class).findHistory(
- context.getProject(), context.getCommit(), context.getBlobIdent().path);
- }
-
- };
-
- private WebMarkupContainer commentContainer;
-
- private WebMarkupContainer outline;
-
- private SourceFormatPanel sourceFormat;
-
- private SymbolTooltipPanel symbolTooltip;
-
- private AbstractPostAjaxBehavior ajaxBehavior;
-
- private BlameMessageBehavior blameMessageBehavior;
-
- private final boolean viewPlainMode;
-
- public SourceViewPanel(String id, BlobRenderContext context, boolean viewPlainMode) {
- super(id, context);
-
- this.viewPlainMode = viewPlainMode;
-
- Blob blob = context.getProject().getBlob(context.getBlobIdent(), true);
-
- String blobName = context.getBlobIdent().getName();
- SymbolExtractor<Symbol> extractor = SymbolExtractorRegistry.getExtractor(blobName);
- if (extractor != null) {
- SearchManager searchManager = OneDev.getInstance(SearchManager.class);
- List<Symbol> cachedSymbols = searchManager.getSymbols(context.getProject(), blob.getBlobId(),
- blob.getIdent().path);
- if (cachedSymbols != null) {
- symbols.addAll(cachedSymbols);
- } else {
- try {
- symbols.addAll(extractor.extract(null, StringUtils.removeBOM(blob.getText().getContent())));
- } catch (Exception e) {
- logger.trace("Can not extract symbols from blob: " + context.getBlobIdent(), e);
- }
- }
- }
-
- }
-
- @Override
- protected WebMarkupContainer newOptions(String id) {
- sourceFormat = new SourceFormatPanel(id, null, new OptionChangeCallback() {
-
- @Override
- public void onOptioneChange(AjaxRequestTarget target) {
- String script = String.format("onedev.server.sourceView.onTabSizeChange(%s);", sourceFormat.getTabSize());
- target.appendJavaScript(script);
- }
-
- }, new OptionChangeCallback() {
-
- @Override
- public void onOptioneChange(AjaxRequestTarget target) {
- String script = String.format("onedev.server.sourceView.onLineWrapModeChange('%s');", sourceFormat.getLineWrapMode());
- target.appendJavaScript(script);
- }
-
- });
- return sourceFormat;
- }
-
- @Override
- public WebMarkupContainer newAdditionalActions(String id) {
- WebMarkupContainer actions = new Fragment(id, "actionsFrag", this);
- if (hasOutline()) {
- actions.add(new CheckBox("outline", Model.of(isOutlineVisibleInitially())).add(new OnChangeAjaxBehavior() {
-
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- attributes.setMethod(Method.POST);
- }
-
- @Override
- protected void onUpdate(AjaxRequestTarget target) {
- toggleOutline(target);
- }
-
- }));
- } else {
- actions.add(new WebMarkupContainer("outline").setVisible(false));
- }
- return actions;
- }
-
- private void toggleOutline(AjaxRequestTarget target) {
- WebResponse response = (WebResponse) RequestCycle.get().getResponse();
- Cookie cookie;
- if (outline.isVisible()) {
- cookie = new Cookie(COOKIE_OUTLINE, "no");
- outline.setVisible(false);
- } else {
- cookie = new Cookie(COOKIE_OUTLINE, "yes");
- outline.setVisible(true);
- }
- cookie.setPath("/");
- cookie.setMaxAge(Integer.MAX_VALUE);
- response.addCookie(cookie);
- target.add(outline);
- target.appendJavaScript("onedev.server.sourceView.onToggleOutline();");
- }
-
- private String getJson(PlanarRange mark) {
- try {
- return OneDev.getInstance(ObjectMapper.class).writeValueAsString(mark);
- } catch (JsonProcessingException e) {
- throw new RuntimeException(e);
- }
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- commentContainer = new WebMarkupContainer("comment", Model.of((PlanarRange)null)) {
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(OnDomReadyHeaderItem.forScript("onedev.server.sourceView.initComment();"));
- }
-
- };
-
- WebMarkupContainer head = new WebMarkupContainer("head") {
-
- @Override
- public void onEvent(IEvent<?> event) {
- super.onEvent(event);
- if (commentContainer.isVisible() && event.getPayload() instanceof PageDataChanged) {
- PageDataChanged pageDataChanged = (PageDataChanged) event.getPayload();
- pageDataChanged.getHandler().add(this);
- }
- }
-
- };
- head.setOutputMarkupId(true);
- commentContainer.add(head);
-
- head.add(new DropdownLink("context") {
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setVisible(context.getPullRequest() == null && context.getOpenComment() != null);
- }
-
- @Override
- protected Component newContent(String id, FloatingPanel dropdown) {
- return new RevisionSelector(id, new AbstractReadOnlyModel<Project>() {
-
- @Override
- public Project getObject() {
- return context.getProject();
- }
-
- }) {
-
- @Override
- protected void onSelect(AjaxRequestTarget target, String revision) {
- RevisionComparePage.State state = new RevisionComparePage.State();
- CodeComment comment = context.getOpenComment();
- state.commentId = comment.getId();
- state.mark = comment.getMarkPos();
- state.compareWithMergeBase = false;
- state.leftSide = new ProjectAndRevision(comment.getProject(),
- comment.getMarkPos().getCommit());
- state.rightSide = new ProjectAndRevision(comment.getProject(), revision);
- state.tabPanel = RevisionComparePage.TabPanel.FILE_CHANGES;
- state.whitespaceOption = context.getOpenComment().getCompareContext().getWhitespaceOption();
- PageParameters params = RevisionComparePage.paramsOf(comment.getProject(), state);
- setResponsePage(RevisionComparePage.class, params);
- }
-
- };
- }
-
- });
-
- head.add(new AjaxLink<Void>("locate") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- CodeComment comment = context.getOpenComment();
- PlanarRange mark;
- if (comment != null) {
- mark = comment.getMarkPos().getRange();
- } else {
- mark = (PlanarRange) commentContainer.getDefaultModelObject();
- }
-
- String position = SourceRendererProvider.getPosition(mark);
- position(target, position);
- context.onPosition(target, position);
- target.appendJavaScript(String.format("$('#%s').blur();", getMarkupId()));
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- setOutputMarkupId(true);
- }
-
- });
-
- head.add(new AjaxLink<Void>("close") {
-
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(commentContainer));
- }
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- closeComment(target);
- }
-
- });
-
- commentContainer.setOutputMarkupPlaceholderTag(true);
-
- if (context.getOpenComment() != null) {
- CodeCommentPanel commentPanel = new CodeCommentPanel(BODY_ID, context.getOpenComment().getId()) {
-
- @Override
- protected void onDeleteComment(AjaxRequestTarget target, CodeComment comment) {
- SourceViewPanel.this.onCommentDeleted(target, comment);
- }
-
- @Override
- protected void onSaveComment(AjaxRequestTarget target, CodeComment comment) {
- target.add(commentContainer.get("head"));
- }
-
- @Override
- protected PullRequest getPullRequest() {
- return context.getPullRequest();
- }
-
- @Override
- protected CompareContext getCompareContext() {
- return SourceViewPanel.this.getCompareContext();
- }
-
- };
- commentContainer.add(commentPanel);
- } else {
- commentContainer.add(new WebMarkupContainer(BODY_ID));
- commentContainer.setVisible(false);
- }
-
- add(commentContainer);
-
- add(ajaxBehavior = new AbstractPostAjaxBehavior() {
-
- @Override
- protected void respond(AjaxRequestTarget target) {
- IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();
- switch(params.getParameterValue("action").toString()) {
- case "openSelectionPopover":
- PlanarRange mark = getMark(params, "param1", "param2", "param3", "param4");
- String unableCommentMessage = null;
- PullRequest request = context.getPullRequest();
- String commitHash = context.getCommit().name();
- if (request != null) {
- boolean found = false;
- for (RevCommit commit: context.getPullRequest().getCommits()) {
- if (commit.name().equals(commitHash)) {
- found = true;
- break;
- }
- }
-
- if (!found) {
- if (request.getMergePreview() != null
- && request.getMergePreview().getMerged() != null
- && request.getMergePreview().getMerged().equals(commitHash)) {
- unableCommentMessage = "Unable to comment on pull request merge preview";
- } else {
- unableCommentMessage = "Unable to comment on commits not belonging to pull request";
- }
- }
- }
-
- String position = SourceRendererProvider.getPosition(mark);
- String script = String.format("onedev.server.sourceView.openSelectionPopover(%s, '%s', %s, %s);",
- getJson(mark), context.getPositionUrl(position), SecurityUtils.getUser()!=null,
- unableCommentMessage!=null?"'" + unableCommentMessage + "'":"undefined");
- target.appendJavaScript(script);
- break;
- case "addComment":
- Preconditions.checkNotNull(SecurityUtils.getUser());
-
- mark = getMark(params, "param1", "param2", "param3", "param4");
- commentContainer.setDefaultModelObject(mark);
-
- Fragment fragment = new Fragment(BODY_ID, "newCommentFrag", SourceViewPanel.this);
- fragment.setOutputMarkupId(true);
-
- Form<?> form = new Form<Void>("form");
-
- String uuid = UUID.randomUUID().toString();
-
- CommentInput contentInput;
-
- StringBuilder mentions = new StringBuilder();
-
- if (context.getPullRequest() == null) {
- /*
- * Outside of pull request, no one will be notified of the comment. So we automatically
- * mention authors of commented lines
- */
- LinearRange range = new LinearRange(mark.getFromRow(), mark.getToRow());
- for (User user: context.getProject().getAuthors(context.getBlobIdent().path, context.getCommit(), range)) {
- if (user.getEmail() != null)
- mentions.append("@").append(user.getName()).append(" ");
- }
- }
-
- form.add(contentInput = new CommentInput("content", Model.of(mentions.toString()), true) {
-
- @Override
- protected ProjectAttachmentSupport getAttachmentSupport() {
- return new ProjectAttachmentSupport(context.getProject(), uuid);
- }
-
- @Override
- protected Project getProject() {
- return context.getProject();
- }
-
- });
- contentInput.setRequired(true).setLabel(Model.of("Comment"));
-
- NotificationPanel feedback = new NotificationPanel("feedback", form);
- feedback.setOutputMarkupPlaceholderTag(true);
- form.add(feedback);
-
- form.add(new AjaxLink<Void>("cancel") {
-
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(form));
- }
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- clearComment(target);
- target.appendJavaScript("onedev.server.sourceView.mark(undefined);");
- target.appendJavaScript("$(window).resize();");
- context.onPosition(target, null);
- }
-
- });
-
- form.add(new AjaxButton("save") {
-
- @Override
- protected void onError(AjaxRequestTarget target, Form<?> form) {
- super.onError(target, form);
- target.add(feedback);
- }
-
- @Override
- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
- super.onSubmit(target, form);
-
- CodeComment comment = new CodeComment();
- comment.setUUID(uuid);
- comment.setMarkPos(new MarkPos());
- comment.getMarkPos().setCommit(context.getCommit().name());
- comment.getMarkPos().setPath(context.getBlobIdent().path);
- comment.setContent(contentInput.getModelObject());
- comment.setUser(SecurityUtils.getUser());
- comment.getMarkPos().setRange(mark);
- comment.setProject(context.getProject());
- comment.setCompareContext(getCompareContext());
-
- OneDev.getInstance(CodeCommentManager.class).create(comment, context.getPullRequest());
-
- CodeCommentPanel commentPanel = new CodeCommentPanel(fragment.getId(), comment.getId()) {
-
- @Override
- protected void onDeleteComment(AjaxRequestTarget target, CodeComment comment) {
- SourceViewPanel.this.onCommentDeleted(target, comment);
- }
-
- @Override
- protected void onSaveComment(AjaxRequestTarget target, CodeComment comment) {
- target.add(commentContainer.get("head"));
- }
-
- @Override
- protected PullRequest getPullRequest() {
- return context.getPullRequest();
- }
-
- @Override
- protected CompareContext getCompareContext() {
- return SourceViewPanel.this.getCompareContext();
- }
-
- };
- commentContainer.replace(commentPanel);
- target.add(commentContainer);
-
- String script = String.format("onedev.server.sourceView.onCommentAdded(%s);", getJsonOfComment(comment));
- target.appendJavaScript(script);
-
- context.onCommentOpened(target, comment);
- }
-
- });
- fragment.add(form);
- commentContainer.replace(fragment);
- commentContainer.setVisible(true);
- target.add(commentContainer);
- context.onAddComment(target, mark);
- target.appendJavaScript(String.format("onedev.server.sourceView.onAddComment(%s);", getJson(mark)));
- break;
- case "toggleComment":
- Long commentId = params.getParameterValue("param1").toLong();
- CodeComment comment = OneDev.getInstance(CodeCommentManager.class).load(commentId);
- if (!comment.equals(context.getOpenComment())) {
- CodeCommentPanel commentPanel = new CodeCommentPanel(BODY_ID, commentId) {
-
- @Override
- protected void onDeleteComment(AjaxRequestTarget target, CodeComment comment) {
- SourceViewPanel.this.onCommentDeleted(target, comment);
- }
-
- @Override
- protected void onSaveComment(AjaxRequestTarget target, CodeComment comment) {
- target.add(commentContainer.get("head"));
- }
-
- @Override
- protected PullRequest getPullRequest() {
- return context.getPullRequest();
- }
-
- @Override
- protected CompareContext getCompareContext() {
- return SourceViewPanel.this.getCompareContext();
- }
-
- };
- commentContainer.replace(commentPanel);
- commentContainer.setVisible(true);
- target.add(commentContainer);
- script = String.format("onedev.server.sourceView.onOpenComment(%s);", getJsonOfComment(comment));
- target.appendJavaScript(script);
- context.onCommentOpened(target, comment);
- } else {
- closeComment(target);
- }
- break;
- case "outlineSearch":
- new ModalPanel(target) {
-
- @Override
- protected Component newContent(String id) {
- return newOutlineSearchPanel(id, this);
- }
-
- };
- break;
- case "syncOutline":
- int line = params.getParameterValue("param1").toInt();
- int ch = params.getParameterValue("param2").toInt();
- Symbol closest = null;
- for (Symbol symbol: symbols) {
- PlanarRange scope = symbol.getScope();
- if (scope != null) {
- if (contains(scope, line, ch)) {
- if (closest != null) {
- if (contains(closest.getScope(), scope.getFromRow(), scope.getFromColumn())
- && contains(closest.getScope(), scope.getToRow(), scope.getToColumn())) {
- closest = symbol;
- }
- } else {
- closest = symbol;
- }
- }
- }
- }
- if (closest != null) {
- @SuppressWarnings("unchecked")
- NestedTree<Symbol> tree = (NestedTree<Symbol>) outline.get(BODY_ID);
- Symbol current = closest;
- while (current != null) {
- tree.expand(current);
- current = current.getParent();
- }
- script = String.format("onedev.server.sourceView.syncOutline('%s');",
- getSymbolId(symbols, closest));
- target.appendJavaScript(script);
- }
- break;
- }
- }
-
- });
-
- add(blameMessageBehavior = new BlameMessageBehavior() {
-
- @Override
- protected Project getProject() {
- return context.getProject();
- }
- });
-
- outline = new WebMarkupContainer("outline") {
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(OnDomReadyHeaderItem.forScript("onedev.server.sourceView.initOutline();"));
- }
-
- };
- outline.add(new AjaxLink<Void>("close") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- toggleOutline(target);
- }
-
- });
-
- IModel<HashSet<Symbol>> state = new Model<HashSet<Symbol>>(new HashSet<>(getChildSymbols(symbols, null)));
- NestedTree<Symbol> tree = new NestedTree<Symbol>(BODY_ID, newSymbolTreeProvider(symbols), state) {
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- add(new HumanTheme());
- }
-
- @Override
- protected Component newContentComponent(String id, IModel<Symbol> nodeModel) {
- Symbol symbol = nodeModel.getObject();
-
- Fragment fragment = new Fragment(id, "outlineNodeFrag", SourceViewPanel.this);
- fragment.setMarkupId(getSymbolId(symbols, symbol));
- fragment.setOutputMarkupId(true);
-
- fragment.add(symbol.renderIcon("icon"));
-
- AjaxLink<Void> link = new ViewStateAwareAjaxLink<Void>("link") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- context.onSelect(target, context.getBlobIdent(), SourceRendererProvider.getPosition(symbol.getPosition()));
- }
-
- };
- link.add(symbol.render("label", null));
- fragment.add(link);
-
- return fragment;
- }
-
- };
-
- outline.add(tree);
-
- outline.setOutputMarkupPlaceholderTag(true);
- add(outline);
-
- outline.setVisible(isOutlineVisibleInitially());
-
- add(symbolTooltip = new SymbolTooltipPanel("symbolTooltip", new AbstractReadOnlyModel<Project>() {
-
- @Override
- public Project getObject() {
- return context.getProject();
- }
-
- }) {
-
- @Override
- protected void onSelect(AjaxRequestTarget target, QueryHit hit) {
- BlobIdent blobIdent = new BlobIdent(
- getRevision(), hit.getBlobPath(), FileMode.REGULAR_FILE.getBits());
- context.onSelect(target, blobIdent, SourceRendererProvider.getPosition(hit.getTokenPos()));
- }
-
- @Override
- protected void onOccurrencesQueried(AjaxRequestTarget target, List<QueryHit> hits) {
- context.onSearchComplete(target, hits);
- }
-
- @Override
- protected String getBlobPath() {
- return context.getBlobIdent().path;
- }
-
- });
- }
-
- private boolean isOutlineVisibleInitially() {
- if (hasOutline()) {
- WebRequest request = (WebRequest) RequestCycle.get().getRequest();
- Cookie cookie = request.getCookie(COOKIE_OUTLINE);
- if (cookie != null) {
- return cookie.getValue().equals("yes");
- } else {
- return !WicketUtils.isDevice();
- }
- } else {
- return false;
- }
- }
-
- private boolean contains(PlanarRange scope, int line, int ch) {
- int fromLine = scope.getFromRow();
- int toLine = scope.getToRow();
- int fromCh = scope.getFromColumn();
- int toCh = scope.getToColumn();
- return (fromLine < line || fromLine == line && fromCh<=ch) && (toLine > line || toLine == line && toCh >= ch);
- }
-
- private CompareContext getCompareContext() {
- CompareContext compareContext = new CompareContext();
- compareContext.setCompareCommit(context.getCommit().name());
- if (context.getBlobIdent().path != null)
- compareContext.setPathFilter(PatternSet.quoteIfNecessary(context.getBlobIdent().path));
- return compareContext;
- }
-
- private PlanarRange getMark(IRequestParameters params, String beginLineParam, String beginCharParam,
- String endLineParam, String endCharParam) {
- int beginLine = params.getParameterValue(beginLineParam).toInt();
- int beginChar = params.getParameterValue(beginCharParam).toInt();
- int endLine = params.getParameterValue(endLineParam).toInt();
- int endChar = params.getParameterValue(endCharParam).toInt();
- PlanarRange mark = new PlanarRange();
- mark.fromRow = beginLine;
- mark.fromColumn = beginChar;
- mark.toRow = endLine;
- mark.toColumn = endChar;
- return mark;
- }
-
- private String getJsonOfComment(CodeComment comment) {
- CommentInfo commentInfo = new CommentInfo();
- commentInfo.id = comment.getId();
- commentInfo.mark = Preconditions.checkNotNull(comment.mapRange(context.getBlobIdent()));
-
- String jsonOfCommentInfo;
- try {
- jsonOfCommentInfo = OneDev.getInstance(ObjectMapper.class).writeValueAsString(commentInfo);
- } catch (JsonProcessingException e) {
- throw new RuntimeException(e);
- }
- return jsonOfCommentInfo;
- }
-
- private void clearComment(AjaxRequestTarget target) {
- commentContainer.replace(new WebMarkupContainer(BODY_ID));
- commentContainer.setVisible(false);
- target.add(commentContainer);
- }
-
- private void onCommentDeleted(AjaxRequestTarget target, CodeComment comment) {
- clearComment(target);
- String script = String.format("onedev.server.sourceView.onCommentDeleted(%s);",
- getJsonOfComment(comment));
- target.appendJavaScript(script);
- context.onCommentOpened(target, null);
- }
-
- private boolean hasOutline() {
- for (Symbol symbol: symbols) {
- if (symbol.isDisplayInOutline())
- return true;
- }
- return false;
- }
-
- private List<Symbol> getChildSymbols(List<Symbol> symbols, @Nullable Symbol parentSymbol) {
- List<Symbol> children = new ArrayList<>();
- for (Symbol symbol: symbols) {
- if (symbol.isDisplayInOutline() && symbol.getOutlineParent() == parentSymbol)
- children.add(symbol);
- }
- return children;
- }
-
- private String getJsonOfBlameInfos(boolean blamed) {
- String jsonOfBlameInfos;
- if (blamed) {
- List<BlameInfo> blameInfos = new ArrayList<>();
-
- String commitHash = context.getCommit().name();
-
- BlameCommand cmd = new BlameCommand(context.getProject().getGitDir());
- cmd.commitHash(commitHash).file(context.getBlobIdent().path);
- for (BlameBlock blame: cmd.call()) {
- BlameInfo blameInfo = new BlameInfo();
- blameInfo.commitDate = DateUtils.formatDate(blame.getCommit().getCommitter().getWhen());
- blameInfo.authorName = HtmlEscape.escapeHtml5(blame.getCommit().getAuthor().getName());
- blameInfo.hash = blame.getCommit().getHash();
- blameInfo.abbreviatedHash = GitUtils.abbreviateSHA(blame.getCommit().getHash(), 7);
- CommitDetailPage.State state = new CommitDetailPage.State();
- state.revision = blame.getCommit().getHash();
- if (context.getBlobIdent().path != null)
- state.pathFilter = PatternSet.quoteIfNecessary(context.getBlobIdent().path);
- PageParameters params = CommitDetailPage.paramsOf(context.getProject(), state);
- blameInfo.url = RequestCycle.get().urlFor(CommitDetailPage.class, params).toString();
- blameInfo.ranges = blame.getRanges();
- blameInfos.add(blameInfo);
- }
- try {
- jsonOfBlameInfos = OneDev.getInstance(ObjectMapper.class).writeValueAsString(blameInfos);
- } catch (JsonProcessingException e) {
- throw new RuntimeException(e);
- }
- } else {
- jsonOfBlameInfos = "undefined";
- }
- return jsonOfBlameInfos;
- }
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
-
- response.render(JavaScriptHeaderItem.forReference(new SourceViewResourceReference()));
-
- Blob blob = context.getProject().getBlob(context.getBlobIdent(), true);
-
- String jsonOfBlameInfos = getJsonOfBlameInfos(context.getMode() == Mode.BLAME);
- Map<Integer, List<CommentInfo>> commentInfos = new HashMap<>();
- for (Map.Entry<CodeComment, PlanarRange> entry: commentsModel.getObject().entrySet()) {
- CodeComment comment = entry.getKey();
- PlanarRange textRange = entry.getValue();
- int line = textRange.getFromRow();
- List<CommentInfo> commentInfosAtLine = commentInfos.get(line);
- if (commentInfosAtLine == null) {
- commentInfosAtLine = new ArrayList<>();
- commentInfos.put(line, commentInfosAtLine);
- }
- CommentInfo commentInfo = new CommentInfo();
- commentInfo.id = comment.getId();
- commentInfo.mark = textRange;
- commentInfosAtLine.add(commentInfo);
- }
- for (List<CommentInfo> value: commentInfos.values()) {
- value.sort((o1, o2)->(int)(o1.id-o2.id));
- }
-
- String jsonOfCommentInfos;
- try {
- jsonOfCommentInfos = OneDev.getInstance(ObjectMapper.class).writeValueAsString(commentInfos);
- } catch (JsonProcessingException e) {
- throw new RuntimeException(e);
- }
-
- PlanarRange mark = SourceRendererProvider.getRange(context.getPosition());
- String jsonOfMark = mark!=null? getJson(mark): "undefined";
-
- CharSequence callback = ajaxBehavior.getCallbackFunction(
- explicit("action"), explicit("param1"), explicit("param2"),
- explicit("param3"), explicit("param4"));
-
- String script = String.format("onedev.server.sourceView.onDomReady('%s', '%s', %s, %s, '%s', '%s', "
- + "%s, %s, %s, %s, %s, '%s');",
- JavaScriptEscape.escapeJavaScript(context.getBlobIdent().path),
- JavaScriptEscape.escapeJavaScript(blob.getText().getContent()),
- context.getOpenComment()!=null?getJsonOfComment(context.getOpenComment()):"undefined",
- jsonOfMark,
- symbolTooltip.getMarkupId(),
- context.getBlobIdent().revision,
- jsonOfBlameInfos,
- jsonOfCommentInfos,
- callback,
- blameMessageBehavior.getCallback(),
- sourceFormat.getTabSize(),
- sourceFormat.getLineWrapMode());
- response.render(OnDomReadyHeaderItem.forScript(script));
-
- script = String.format("onedev.server.sourceView.onWindowLoad(%s);", jsonOfMark);
- response.render(OnLoadHeaderItem.forScript(script));
- }
-
- @Override
- protected void onDetach() {
- commentsModel.detach();
- super.onDetach();
- }
-
- @SuppressWarnings("unused")
- private static class BlameInfo {
-
- String abbreviatedHash;
-
- String hash;
-
- String url;
-
- String authorName;
-
- String commitDate;
-
- List<LinearRange> ranges;
- }
-
- private String getSymbolId(List<Symbol> symbols, Symbol symbol) {
- return "outline-symbol-" + symbols.indexOf(symbol);
- }
-
- @SuppressWarnings("unused")
- private static class CommentInfo {
- long id;
-
- String title;
-
- PlanarRange mark;
- }
-
- @Override
- protected boolean isEditSupported() {
- return true;
- }
-
- @Override
- public void position(AjaxRequestTarget target, String position) {
- String script;
- PlanarRange mark = SourceRendererProvider.getRange(position);
- if (mark != null) {
- script = String.format("onedev.server.sourceView.mark(%s);", getJson(mark));
- } else {
- script = String.format("onedev.server.sourceView.mark(undefined);");
- }
- target.appendJavaScript(script);
- }
-
- private ITreeProvider<Symbol> newSymbolTreeProvider(List<Symbol> symbols) {
- return new ITreeProvider<Symbol>() {
-
- @Override
- public void detach() {
- }
-
- @Override
- public Iterator<? extends Symbol> getRoots() {
- return getChildSymbols(symbols, null).iterator();
- }
-
- @Override
- public boolean hasChildren(Symbol symbol) {
- return !getChildSymbols(symbols, symbol).isEmpty();
- }
-
- @Override
- public Iterator<? extends Symbol> getChildren(Symbol symbol) {
- return getChildSymbols(symbols, symbol).iterator();
- }
-
- @Override
- public IModel<Symbol> model(Symbol symbol) {
- return Model.of(symbol);
- }
-
- };
- }
-
- private NestedTree<Symbol> newOutlineSearchSymbolTree(ModalPanel modal, List<Symbol> symbols,
- @Nullable String searchInput) {
- IModel<HashSet<Symbol>> state;
- if (StringUtils.isNotBlank(searchInput)) {
- state = new Model<HashSet<Symbol>>(new HashSet<>(symbols));
- } else {
- state = new Model<HashSet<Symbol>>(new HashSet<>(getChildSymbols(symbols, null)));
- }
- NestedTree<Symbol> tree = new NestedTree<Symbol>("result", newSymbolTreeProvider(symbols), state) {
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- add(new HumanTheme());
- }
-
- @Override
- protected Component newContentComponent(String id, IModel<Symbol> nodeModel) {
- Symbol symbol = nodeModel.getObject();
-
- Fragment fragment = new Fragment(id, "outlineSearchNodeFrag", SourceViewPanel.this);
- fragment.setOutputMarkupId(true);
-
- AjaxLink<Void> link = new ViewStateAwareAjaxLink<Void>("link") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- modal.close();
- context.onSelect(target, context.getBlobIdent(), SourceRendererProvider.getPosition(symbol.getPosition()));
- }
-
- };
- link.add(symbol.renderIcon("icon"));
- link.add(symbol.render("label", null));
- link.add(AttributeAppender.append("data-symbolindex", symbols.indexOf(symbol)));
-
- fragment.add(link);
-
- if (symbol == symbols.get(0)) {
- link.add(AttributeAppender.append("class", "active"));
- }
-
- return fragment;
- }
-
- };
-
- tree.setOutputMarkupId(true);
-
- return tree;
- }
-
- private void closeComment(AjaxRequestTarget target) {
- clearComment(target);
- if (context.getOpenComment() != null)
- context.onCommentOpened(target, null);
- target.appendJavaScript("onedev.server.sourceView.onCloseComment();");
- }
-
- private Component newOutlineSearchPanel(String id, ModalPanel modal) {
- Fragment fragment = new Fragment(id, "outlineSearchFrag", SourceViewPanel.this);
- fragment.add(new AjaxLink<Void>("close") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- modal.close();
- }
-
- });
-
- TextField<String> searchField = new TextField<>("input");
- fragment.add(searchField);
- fragment.add(newOutlineSearchSymbolTree(modal, symbols, null));
-
- fragment.add(new AbstractPostAjaxBehavior() {
-
- private List<Symbol> filteredSymbols = new ArrayList<Symbol>(symbols);
-
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- attributes.setChannel(new AjaxChannel("outline-search-input", AjaxChannel.Type.DROP));
- }
-
- @Override
- protected void respond(AjaxRequestTarget target) {
- IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();
- String key = params.getParameterValue("key").toString();
-
- if (key.equals("input")) {
- String searchInput = params.getParameterValue("param").toString();
-
- MatchScoreProvider<Symbol> matchScoreProvider = new MatchScoreProvider<Symbol>() {
-
- @Override
- public double getMatchScore(Symbol object) {
- return MatchScoreUtils.getMatchScore(object.getName(), searchInput);
- }
-
- };
-
- List<Symbol> matchSymbols = MatchScoreUtils.filterAndSort(symbols, matchScoreProvider);
-
- filteredSymbols = new ArrayList<>();
- for (Symbol symbol: matchSymbols) {
- Symbol current = symbol;
- while (current != null) {
- if (!filteredSymbols.contains(current))
- filteredSymbols.add(current);
- current = current.getOutlineParent();
- }
- }
-
- NestedTree<Symbol> tree = newOutlineSearchSymbolTree(modal, filteredSymbols, searchInput);
- fragment.replace(tree);
- target.add(tree);
- } else if (key.equals("return")) {
- int symbolIndex = params.getParameterValue("param").toInt();
- Symbol symbol = filteredSymbols.get(symbolIndex);
- context.onSelect(target, context.getBlobIdent(), SourceRendererProvider.getPosition(symbol.getPosition()));
- modal.close();
- } else {
- throw new IllegalStateException("Unrecognized key: " + key);
- }
- }
-
- @Override
- public void renderHead(Component component, IHeaderResponse response) {
- super.renderHead(component, response);
- String script = String.format(
- "onedev.server.sourceView.onOutlineSearchDomReady('%s', %s);",
- fragment.getMarkupId(),
- getCallbackFunction(explicit("key"), explicit("param")));
-
- response.render(OnDomReadyHeaderItem.forScript(script));
- }
-
- });
- fragment.setOutputMarkupId(true);
-
- return fragment;
- }
-
- @Override
- public List<MenuItem> getMenuItems(FloatingPanel dropdown) {
- List<MenuItem> menuItems = new ArrayList<>();
- if (hasOutline()) {
- menuItems.add(new MenuItem() {
-
- @Override
- public String getShortcut() {
- return "O";
- }
-
- @Override
- public String getLabel() {
- return "Outline Search";
- }
-
- @Override
- public WebMarkupContainer newLink(String id) {
- return new ModalLink(id) {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- super.onClick(target);
- dropdown.close();
- }
-
- @Override
- protected Component newContent(String id, ModalPanel modal) {
- return newOutlineSearchPanel(id, modal);
- }
-
- };
- }
-
- });
- }
- return menuItems;
- }
-
- @Override
- protected boolean isViewPlainSupported() {
- return viewPlainMode;
- }
-
-}
+package io.onedev.server.web.page.project.blob.render.renderers.source;
+
+import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import javax.annotation.Nullable;
+import javax.servlet.http.Cookie;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxChannel;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes.Method;
+import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.ajax.markup.html.form.AjaxButton;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.event.IEvent;
+import org.apache.wicket.extensions.markup.html.repeater.tree.ITreeProvider;
+import org.apache.wicket.extensions.markup.html.repeater.tree.NestedTree;
+import org.apache.wicket.extensions.markup.html.repeater.tree.theme.HumanTheme;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
+import org.apache.wicket.markup.head.OnLoadHeaderItem;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.form.CheckBox;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.model.AbstractReadOnlyModel;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.request.IRequestParameters;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.http.WebRequest;
+import org.apache.wicket.request.http.WebResponse;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.eclipse.jgit.lib.FileMode;
+import org.eclipse.jgit.revwalk.RevCommit;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.unbescape.html.HtmlEscape;
+import org.unbescape.javascript.JavaScriptEscape;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.base.Preconditions;
+
+import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
+import io.onedev.commons.jsymbol.Symbol;
+import io.onedev.commons.jsymbol.SymbolExtractor;
+import io.onedev.commons.jsymbol.SymbolExtractorRegistry;
+import io.onedev.commons.utils.LinearRange;
+import io.onedev.commons.utils.PlanarRange;
+import io.onedev.commons.utils.StringUtils;
+import io.onedev.commons.utils.matchscore.MatchScoreProvider;
+import io.onedev.commons.utils.matchscore.MatchScoreUtils;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.CodeCommentManager;
+import io.onedev.server.git.BlameBlock;
+import io.onedev.server.git.Blob;
+import io.onedev.server.git.BlobIdent;
+import io.onedev.server.git.GitUtils;
+import io.onedev.server.git.command.BlameCommand;
+import io.onedev.server.model.CodeComment;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.User;
+import io.onedev.server.model.support.CompareContext;
+import io.onedev.server.model.support.MarkPos;
+import io.onedev.server.model.support.ProjectAndRevision;
+import io.onedev.server.search.code.SearchManager;
+import io.onedev.server.search.code.hit.QueryHit;
+import io.onedev.server.util.DateUtils;
+import io.onedev.server.util.SecurityUtils;
+import io.onedev.server.util.patternset.PatternSet;
+import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
+import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
+import io.onedev.server.web.behavior.blamemessage.BlameMessageBehavior;
+import io.onedev.server.web.component.codecomment.CodeCommentPanel;
+import io.onedev.server.web.component.floating.FloatingPanel;
+import io.onedev.server.web.component.link.DropdownLink;
+import io.onedev.server.web.component.link.ViewStateAwareAjaxLink;
+import io.onedev.server.web.component.menu.MenuItem;
+import io.onedev.server.web.component.modal.ModalLink;
+import io.onedev.server.web.component.modal.ModalPanel;
+import io.onedev.server.web.component.project.comment.CommentInput;
+import io.onedev.server.web.component.revisionpicker.RevisionSelector;
+import io.onedev.server.web.component.sourceformat.OptionChangeCallback;
+import io.onedev.server.web.component.sourceformat.SourceFormatPanel;
+import io.onedev.server.web.component.symboltooltip.SymbolTooltipPanel;
+import io.onedev.server.web.page.project.blob.render.BlobRenderContext;
+import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;
+import io.onedev.server.web.page.project.blob.render.view.BlobViewPanel;
+import io.onedev.server.web.page.project.blob.render.view.Positionable;
+import io.onedev.server.web.page.project.blob.search.SearchMenuContributor;
+import io.onedev.server.web.page.project.commits.CommitDetailPage;
+import io.onedev.server.web.page.project.compare.RevisionComparePage;
+import io.onedev.server.web.util.ProjectAttachmentSupport;
+import io.onedev.server.web.util.WicketUtils;
+import io.onedev.server.web.websocket.PageDataChanged;
+
+/**
+ * Make sure to add only one source view panel per page
+ *
+ * @author robin
+ *
+ */
+@SuppressWarnings("serial")
+public class SourceViewPanel extends BlobViewPanel implements Positionable, SearchMenuContributor {
+
+ private static final Logger logger = LoggerFactory.getLogger(SourceViewPanel.class);
+
+ private static final String COOKIE_OUTLINE = "sourceView.outline";
+
+ private static final String BODY_ID = "body";
+
+ private final List<Symbol> symbols = new ArrayList<>();
+
+ private final IModel<Map<CodeComment, PlanarRange>> commentsModel =
+ new LoadableDetachableModel<Map<CodeComment, PlanarRange>>() {
+
+ @Override
+ protected Map<CodeComment, PlanarRange> load() {
+ return OneDev.getInstance(CodeCommentManager.class).findHistory(
+ context.getProject(), context.getCommit(), context.getBlobIdent().path);
+ }
+
+ };
+
+ private WebMarkupContainer commentContainer;
+
+ private WebMarkupContainer outline;
+
+ private SourceFormatPanel sourceFormat;
+
+ private SymbolTooltipPanel symbolTooltip;
+
+ private AbstractPostAjaxBehavior ajaxBehavior;
+
+ private BlameMessageBehavior blameMessageBehavior;
+
+ private final boolean viewPlainMode;
+
+ public SourceViewPanel(String id, BlobRenderContext context, boolean viewPlainMode) {
+ super(id, context);
+
+ this.viewPlainMode = viewPlainMode;
+
+ Blob blob = context.getProject().getBlob(context.getBlobIdent(), true);
+
+ String blobName = context.getBlobIdent().getName();
+ SymbolExtractor<Symbol> extractor = SymbolExtractorRegistry.getExtractor(blobName);
+ if (extractor != null) {
+ SearchManager searchManager = OneDev.getInstance(SearchManager.class);
+ List<Symbol> cachedSymbols = searchManager.getSymbols(context.getProject(), blob.getBlobId(),
+ blob.getIdent().path);
+ if (cachedSymbols != null) {
+ symbols.addAll(cachedSymbols);
+ } else {
+ try {
+ symbols.addAll(extractor.extract(null, StringUtils.removeBOM(blob.getText().getContent())));
+ } catch (Exception e) {
+ logger.trace("Can not extract symbols from blob: " + context.getBlobIdent(), e);
+ }
+ }
+ }
+
+ }
+
+ @Override
+ protected WebMarkupContainer newOptions(String id) {
+ sourceFormat = new SourceFormatPanel(id, null, new OptionChangeCallback() {
+
+ @Override
+ public void onOptioneChange(AjaxRequestTarget target) {
+ String script = String.format("onedev.server.sourceView.onTabSizeChange(%s);", sourceFormat.getTabSize());
+ target.appendJavaScript(script);
+ }
+
+ }, new OptionChangeCallback() {
+
+ @Override
+ public void onOptioneChange(AjaxRequestTarget target) {
+ String script = String.format("onedev.server.sourceView.onLineWrapModeChange('%s');", sourceFormat.getLineWrapMode());
+ target.appendJavaScript(script);
+ }
+
+ });
+ return sourceFormat;
+ }
+
+ @Override
+ public WebMarkupContainer newAdditionalActions(String id) {
+ WebMarkupContainer actions = new Fragment(id, "actionsFrag", this);
+ if (hasOutline()) {
+ actions.add(new CheckBox("outline", Model.of(isOutlineVisibleInitially())).add(new OnChangeAjaxBehavior() {
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.setMethod(Method.POST);
+ }
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ toggleOutline(target);
+ }
+
+ }));
+ } else {
+ actions.add(new WebMarkupContainer("outline").setVisible(false));
+ }
+ return actions;
+ }
+
+ private void toggleOutline(AjaxRequestTarget target) {
+ WebResponse response = (WebResponse) RequestCycle.get().getResponse();
+ Cookie cookie;
+ if (outline.isVisible()) {
+ cookie = new Cookie(COOKIE_OUTLINE, "no");
+ outline.setVisible(false);
+ } else {
+ cookie = new Cookie(COOKIE_OUTLINE, "yes");
+ outline.setVisible(true);
+ }
+ cookie.setPath("/");
+ cookie.setMaxAge(Integer.MAX_VALUE);
+ response.addCookie(cookie);
+ target.add(outline);
+ target.appendJavaScript("onedev.server.sourceView.onToggleOutline();");
+ }
+
+ private String getJson(PlanarRange mark) {
+ try {
+ return OneDev.getInstance(ObjectMapper.class).writeValueAsString(mark);
+ } catch (JsonProcessingException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ commentContainer = new WebMarkupContainer("comment", Model.of((PlanarRange)null)) {
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(OnDomReadyHeaderItem.forScript("onedev.server.sourceView.initComment();"));
+ }
+
+ };
+
+ WebMarkupContainer head = new WebMarkupContainer("head") {
+
+ @Override
+ public void onEvent(IEvent<?> event) {
+ super.onEvent(event);
+ if (commentContainer.isVisible() && event.getPayload() instanceof PageDataChanged) {
+ PageDataChanged pageDataChanged = (PageDataChanged) event.getPayload();
+ pageDataChanged.getHandler().add(this);
+ }
+ }
+
+ };
+ head.setOutputMarkupId(true);
+ commentContainer.add(head);
+
+ head.add(new DropdownLink("context") {
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(context.getPullRequest() == null && context.getOpenComment() != null);
+ }
+
+ @Override
+ protected Component newContent(String id, FloatingPanel dropdown) {
+ return new RevisionSelector(id, new AbstractReadOnlyModel<Project>() {
+
+ @Override
+ public Project getObject() {
+ return context.getProject();
+ }
+
+ }) {
+
+ @Override
+ protected void onSelect(AjaxRequestTarget target, String revision) {
+ RevisionComparePage.State state = new RevisionComparePage.State();
+ CodeComment comment = context.getOpenComment();
+ state.commentId = comment.getId();
+ state.mark = comment.getMarkPos();
+ state.compareWithMergeBase = false;
+ state.leftSide = new ProjectAndRevision(comment.getProject(),
+ comment.getMarkPos().getCommit());
+ state.rightSide = new ProjectAndRevision(comment.getProject(), revision);
+ state.tabPanel = RevisionComparePage.TabPanel.FILE_CHANGES;
+ state.whitespaceOption = context.getOpenComment().getCompareContext().getWhitespaceOption();
+ PageParameters params = RevisionComparePage.paramsOf(comment.getProject(), state);
+ setResponsePage(RevisionComparePage.class, params);
+ }
+
+ };
+ }
+
+ });
+
+ head.add(new AjaxLink<Void>("locate") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ CodeComment comment = context.getOpenComment();
+ PlanarRange mark;
+ if (comment != null) {
+ mark = comment.getMarkPos().getRange();
+ } else {
+ mark = (PlanarRange) commentContainer.getDefaultModelObject();
+ }
+
+ String position = SourceRendererProvider.getPosition(mark);
+ position(target, position);
+ context.onPosition(target, position);
+ target.appendJavaScript(String.format("$('#%s').blur();", getMarkupId()));
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ setOutputMarkupId(true);
+ }
+
+ });
+
+ head.add(new AjaxLink<Void>("close") {
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(commentContainer));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ closeComment(target);
+ }
+
+ });
+
+ commentContainer.setOutputMarkupPlaceholderTag(true);
+
+ if (context.getOpenComment() != null) {
+ CodeCommentPanel commentPanel = new CodeCommentPanel(BODY_ID, context.getOpenComment().getId()) {
+
+ @Override
+ protected void onDeleteComment(AjaxRequestTarget target, CodeComment comment) {
+ SourceViewPanel.this.onCommentDeleted(target, comment);
+ }
+
+ @Override
+ protected void onSaveComment(AjaxRequestTarget target, CodeComment comment) {
+ target.add(commentContainer.get("head"));
+ }
+
+ @Override
+ protected PullRequest getPullRequest() {
+ return context.getPullRequest();
+ }
+
+ @Override
+ protected CompareContext getCompareContext() {
+ return SourceViewPanel.this.getCompareContext();
+ }
+
+ };
+ commentContainer.add(commentPanel);
+ } else {
+ commentContainer.add(new WebMarkupContainer(BODY_ID));
+ commentContainer.setVisible(false);
+ }
+
+ add(commentContainer);
+
+ add(ajaxBehavior = new AbstractPostAjaxBehavior() {
+
+ @Override
+ protected void respond(AjaxRequestTarget target) {
+ IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();
+ switch(params.getParameterValue("action").toString()) {
+ case "openSelectionPopover":
+ PlanarRange mark = getMark(params, "param1", "param2", "param3", "param4");
+ String unableCommentMessage = null;
+ PullRequest request = context.getPullRequest();
+ String commitHash = context.getCommit().name();
+ if (request != null) {
+ boolean found = false;
+ for (RevCommit commit: context.getPullRequest().getCommits()) {
+ if (commit.name().equals(commitHash)) {
+ found = true;
+ break;
+ }
+ }
+
+ if (!found) {
+ if (request.getMergePreview() != null
+ && request.getMergePreview().getMerged() != null
+ && request.getMergePreview().getMerged().equals(commitHash)) {
+ unableCommentMessage = "Unable to comment on pull request merge preview";
+ } else {
+ unableCommentMessage = "Unable to comment on commits not belonging to pull request";
+ }
+ }
+ }
+
+ String position = SourceRendererProvider.getPosition(mark);
+ String script = String.format("onedev.server.sourceView.openSelectionPopover(%s, '%s', %s, %s);",
+ getJson(mark), context.getPositionUrl(position), SecurityUtils.getUser()!=null,
+ unableCommentMessage!=null?"'" + unableCommentMessage + "'":"undefined");
+ target.appendJavaScript(script);
+ break;
+ case "addComment":
+ Preconditions.checkNotNull(SecurityUtils.getUser());
+
+ mark = getMark(params, "param1", "param2", "param3", "param4");
+ commentContainer.setDefaultModelObject(mark);
+
+ Fragment fragment = new Fragment(BODY_ID, "newCommentFrag", SourceViewPanel.this);
+ fragment.setOutputMarkupId(true);
+
+ Form<?> form = new Form<Void>("form");
+
+ String uuid = UUID.randomUUID().toString();
+
+ CommentInput contentInput;
+
+ StringBuilder mentions = new StringBuilder();
+
+ if (context.getPullRequest() == null) {
+ /*
+ * Outside of pull request, no one will be notified of the comment. So we automatically
+ * mention authors of commented lines
+ */
+ LinearRange range = new LinearRange(mark.getFromRow(), mark.getToRow());
+ for (User user: context.getProject().getAuthors(context.getBlobIdent().path, context.getCommit(), range)) {
+ if (user.getEmail() != null)
+ mentions.append("@").append(user.getName()).append(" ");
+ }
+ }
+
+ form.add(contentInput = new CommentInput("content", Model.of(mentions.toString()), true) {
+
+ @Override
+ protected ProjectAttachmentSupport getAttachmentSupport() {
+ return new ProjectAttachmentSupport(context.getProject(), uuid);
+ }
+
+ @Override
+ protected Project getProject() {
+ return context.getProject();
+ }
+
+ });
+ contentInput.setRequired(true).setLabel(Model.of("Comment"));
+
+ NotificationPanel feedback = new NotificationPanel("feedback", form);
+ feedback.setOutputMarkupPlaceholderTag(true);
+ form.add(feedback);
+
+ form.add(new AjaxLink<Void>("cancel") {
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(form));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ clearComment(target);
+ target.appendJavaScript("onedev.server.sourceView.mark(undefined);");
+ target.appendJavaScript("$(window).resize();");
+ context.onPosition(target, null);
+ }
+
+ });
+
+ form.add(new AjaxButton("save") {
+
+ @Override
+ protected void onError(AjaxRequestTarget target, Form<?> form) {
+ super.onError(target, form);
+ target.add(feedback);
+ }
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
+ super.onSubmit(target, form);
+
+ CodeComment comment = new CodeComment();
+ comment.setUUID(uuid);
+ comment.setMarkPos(new MarkPos());
+ comment.getMarkPos().setCommit(context.getCommit().name());
+ comment.getMarkPos().setPath(context.getBlobIdent().path);
+ comment.setContent(contentInput.getModelObject());
+ comment.setUser(SecurityUtils.getUser());
+ comment.getMarkPos().setRange(mark);
+ comment.setProject(context.getProject());
+ comment.setCompareContext(getCompareContext());
+
+ OneDev.getInstance(CodeCommentManager.class).create(comment, context.getPullRequest());
+
+ CodeCommentPanel commentPanel = new CodeCommentPanel(fragment.getId(), comment.getId()) {
+
+ @Override
+ protected void onDeleteComment(AjaxRequestTarget target, CodeComment comment) {
+ SourceViewPanel.this.onCommentDeleted(target, comment);
+ }
+
+ @Override
+ protected void onSaveComment(AjaxRequestTarget target, CodeComment comment) {
+ target.add(commentContainer.get("head"));
+ }
+
+ @Override
+ protected PullRequest getPullRequest() {
+ return context.getPullRequest();
+ }
+
+ @Override
+ protected CompareContext getCompareContext() {
+ return SourceViewPanel.this.getCompareContext();
+ }
+
+ };
+ commentContainer.replace(commentPanel);
+ target.add(commentContainer);
+
+ String script = String.format("onedev.server.sourceView.onCommentAdded(%s);", getJsonOfComment(comment));
+ target.appendJavaScript(script);
+
+ context.onCommentOpened(target, comment);
+ }
+
+ });
+ fragment.add(form);
+ commentContainer.replace(fragment);
+ commentContainer.setVisible(true);
+ target.add(commentContainer);
+ context.onAddComment(target, mark);
+ target.appendJavaScript(String.format("onedev.server.sourceView.onAddComment(%s);", getJson(mark)));
+ break;
+ case "toggleComment":
+ Long commentId = params.getParameterValue("param1").toLong();
+ CodeComment comment = OneDev.getInstance(CodeCommentManager.class).load(commentId);
+ if (!comment.equals(context.getOpenComment())) {
+ CodeCommentPanel commentPanel = new CodeCommentPanel(BODY_ID, commentId) {
+
+ @Override
+ protected void onDeleteComment(AjaxRequestTarget target, CodeComment comment) {
+ SourceViewPanel.this.onCommentDeleted(target, comment);
+ }
+
+ @Override
+ protected void onSaveComment(AjaxRequestTarget target, CodeComment comment) {
+ target.add(commentContainer.get("head"));
+ }
+
+ @Override
+ protected PullRequest getPullRequest() {
+ return context.getPullRequest();
+ }
+
+ @Override
+ protected CompareContext getCompareContext() {
+ return SourceViewPanel.this.getCompareContext();
+ }
+
+ };
+ commentContainer.replace(commentPanel);
+ commentContainer.setVisible(true);
+ target.add(commentContainer);
+ script = String.format("onedev.server.sourceView.onOpenComment(%s);", getJsonOfComment(comment));
+ target.appendJavaScript(script);
+ context.onCommentOpened(target, comment);
+ } else {
+ closeComment(target);
+ }
+ break;
+ case "outlineSearch":
+ new ModalPanel(target) {
+
+ @Override
+ protected Component newContent(String id) {
+ return newOutlineSearchPanel(id, this);
+ }
+
+ };
+ break;
+ case "syncOutline":
+ int line = params.getParameterValue("param1").toInt();
+ int ch = params.getParameterValue("param2").toInt();
+ Symbol closest = null;
+ for (Symbol symbol: symbols) {
+ PlanarRange scope = symbol.getScope();
+ if (scope != null) {
+ if (contains(scope, line, ch)) {
+ if (closest != null) {
+ if (contains(closest.getScope(), scope.getFromRow(), scope.getFromColumn())
+ && contains(closest.getScope(), scope.getToRow(), scope.getToColumn())) {
+ closest = symbol;
+ }
+ } else {
+ closest = symbol;
+ }
+ }
+ }
+ }
+ if (closest != null) {
+ @SuppressWarnings("unchecked")
+ NestedTree<Symbol> tree = (NestedTree<Symbol>) outline.get(BODY_ID);
+ Symbol current = closest;
+ while (current != null) {
+ tree.expand(current);
+ current = current.getParent();
+ }
+ script = String.format("onedev.server.sourceView.syncOutline('%s');",
+ getSymbolId(symbols, closest));
+ target.appendJavaScript(script);
+ }
+ break;
+ }
+ }
+
+ });
+
+ add(blameMessageBehavior = new BlameMessageBehavior() {
+
+ @Override
+ protected Project getProject() {
+ return context.getProject();
+ }
+ });
+
+ outline = new WebMarkupContainer("outline") {
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(OnDomReadyHeaderItem.forScript("onedev.server.sourceView.initOutline();"));
+ }
+
+ };
+ outline.add(new AjaxLink<Void>("close") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ toggleOutline(target);
+ }
+
+ });
+
+ IModel<HashSet<Symbol>> state = new Model<HashSet<Symbol>>(new HashSet<>(getChildSymbols(symbols, null)));
+ NestedTree<Symbol> tree = new NestedTree<Symbol>(BODY_ID, newSymbolTreeProvider(symbols), state) {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(new HumanTheme());
+ }
+
+ @Override
+ protected Component newContentComponent(String id, IModel<Symbol> nodeModel) {
+ Symbol symbol = nodeModel.getObject();
+
+ Fragment fragment = new Fragment(id, "outlineNodeFrag", SourceViewPanel.this);
+ fragment.setMarkupId(getSymbolId(symbols, symbol));
+ fragment.setOutputMarkupId(true);
+
+ fragment.add(symbol.renderIcon("icon"));
+
+ AjaxLink<Void> link = new ViewStateAwareAjaxLink<Void>("link") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ context.onSelect(target, context.getBlobIdent(), SourceRendererProvider.getPosition(symbol.getPosition()));
+ }
+
+ };
+ link.add(symbol.render("label", null));
+ fragment.add(link);
+
+ return fragment;
+ }
+
+ };
+
+ outline.add(tree);
+
+ outline.setOutputMarkupPlaceholderTag(true);
+ add(outline);
+
+ outline.setVisible(isOutlineVisibleInitially());
+
+ add(symbolTooltip = new SymbolTooltipPanel("symbolTooltip", new AbstractReadOnlyModel<Project>() {
+
+ @Override
+ public Project getObject() {
+ return context.getProject();
+ }
+
+ }) {
+
+ @Override
+ protected void onSelect(AjaxRequestTarget target, QueryHit hit) {
+ BlobIdent blobIdent = new BlobIdent(
+ getRevision(), hit.getBlobPath(), FileMode.REGULAR_FILE.getBits());
+ context.onSelect(target, blobIdent, SourceRendererProvider.getPosition(hit.getTokenPos()));
+ }
+
+ @Override
+ protected void onOccurrencesQueried(AjaxRequestTarget target, List<QueryHit> hits) {
+ context.onSearchComplete(target, hits);
+ }
+
+ @Override
+ protected String getBlobPath() {
+ return context.getBlobIdent().path;
+ }
+
+ });
+ }
+
+ private boolean isOutlineVisibleInitially() {
+ if (hasOutline()) {
+ WebRequest request = (WebRequest) RequestCycle.get().getRequest();
+ Cookie cookie = request.getCookie(COOKIE_OUTLINE);
+ if (cookie != null) {
+ return cookie.getValue().equals("yes");
+ } else {
+ return !WicketUtils.isDevice();
+ }
+ } else {
+ return false;
+ }
+ }
+
+ private boolean contains(PlanarRange scope, int line, int ch) {
+ int fromLine = scope.getFromRow();
+ int toLine = scope.getToRow();
+ int fromCh = scope.getFromColumn();
+ int toCh = scope.getToColumn();
+ return (fromLine < line || fromLine == line && fromCh<=ch) && (toLine > line || toLine == line && toCh >= ch);
+ }
+
+ private CompareContext getCompareContext() {
+ CompareContext compareContext = new CompareContext();
+ compareContext.setCompareCommit(context.getCommit().name());
+ if (context.getBlobIdent().path != null)
+ compareContext.setPathFilter(PatternSet.quoteIfNecessary(context.getBlobIdent().path));
+ return compareContext;
+ }
+
+ private PlanarRange getMark(IRequestParameters params, String beginLineParam, String beginCharParam,
+ String endLineParam, String endCharParam) {
+ int beginLine = params.getParameterValue(beginLineParam).toInt();
+ int beginChar = params.getParameterValue(beginCharParam).toInt();
+ int endLine = params.getParameterValue(endLineParam).toInt();
+ int endChar = params.getParameterValue(endCharParam).toInt();
+ PlanarRange mark = new PlanarRange();
+ mark.fromRow = beginLine;
+ mark.fromColumn = beginChar;
+ mark.toRow = endLine;
+ mark.toColumn = endChar;
+ return mark;
+ }
+
+ private String getJsonOfComment(CodeComment comment) {
+ CommentInfo commentInfo = new CommentInfo();
+ commentInfo.id = comment.getId();
+ commentInfo.mark = Preconditions.checkNotNull(comment.mapRange(context.getBlobIdent()));
+
+ String jsonOfCommentInfo;
+ try {
+ jsonOfCommentInfo = OneDev.getInstance(ObjectMapper.class).writeValueAsString(commentInfo);
+ } catch (JsonProcessingException e) {
+ throw new RuntimeException(e);
+ }
+ return jsonOfCommentInfo;
+ }
+
+ private void clearComment(AjaxRequestTarget target) {
+ commentContainer.replace(new WebMarkupContainer(BODY_ID));
+ commentContainer.setVisible(false);
+ target.add(commentContainer);
+ }
+
+ private void onCommentDeleted(AjaxRequestTarget target, CodeComment comment) {
+ clearComment(target);
+ String script = String.format("onedev.server.sourceView.onCommentDeleted(%s);",
+ getJsonOfComment(comment));
+ target.appendJavaScript(script);
+ context.onCommentOpened(target, null);
+ }
+
+ private boolean hasOutline() {
+ for (Symbol symbol: symbols) {
+ if (symbol.isDisplayInOutline())
+ return true;
+ }
+ return false;
+ }
+
+ private List<Symbol> getChildSymbols(List<Symbol> symbols, @Nullable Symbol parentSymbol) {
+ List<Symbol> children = new ArrayList<>();
+ for (Symbol symbol: symbols) {
+ if (symbol.isDisplayInOutline() && symbol.getOutlineParent() == parentSymbol)
+ children.add(symbol);
+ }
+ return children;
+ }
+
+ private String getJsonOfBlameInfos(boolean blamed) {
+ String jsonOfBlameInfos;
+ if (blamed) {
+ List<BlameInfo> blameInfos = new ArrayList<>();
+
+ String commitHash = context.getCommit().name();
+
+ BlameCommand cmd = new BlameCommand(context.getProject().getGitDir());
+ cmd.commitHash(commitHash).file(context.getBlobIdent().path);
+ for (BlameBlock blame: cmd.call()) {
+ BlameInfo blameInfo = new BlameInfo();
+ blameInfo.commitDate = DateUtils.formatDate(blame.getCommit().getCommitter().getWhen());
+ blameInfo.authorName = HtmlEscape.escapeHtml5(blame.getCommit().getAuthor().getName());
+ blameInfo.hash = blame.getCommit().getHash();
+ blameInfo.abbreviatedHash = GitUtils.abbreviateSHA(blame.getCommit().getHash(), 7);
+ CommitDetailPage.State state = new CommitDetailPage.State();
+ state.revision = blame.getCommit().getHash();
+ if (context.getBlobIdent().path != null)
+ state.pathFilter = PatternSet.quoteIfNecessary(context.getBlobIdent().path);
+ PageParameters params = CommitDetailPage.paramsOf(context.getProject(), state);
+ blameInfo.url = RequestCycle.get().urlFor(CommitDetailPage.class, params).toString();
+ blameInfo.ranges = blame.getRanges();
+ blameInfos.add(blameInfo);
+ }
+ try {
+ jsonOfBlameInfos = OneDev.getInstance(ObjectMapper.class).writeValueAsString(blameInfos);
+ } catch (JsonProcessingException e) {
+ throw new RuntimeException(e);
+ }
+ } else {
+ jsonOfBlameInfos = "undefined";
+ }
+ return jsonOfBlameInfos;
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+
+ response.render(JavaScriptHeaderItem.forReference(new SourceViewResourceReference()));
+
+ Blob blob = context.getProject().getBlob(context.getBlobIdent(), true);
+
+ String jsonOfBlameInfos = getJsonOfBlameInfos(context.getMode() == Mode.BLAME);
+ Map<Integer, List<CommentInfo>> commentInfos = new HashMap<>();
+ for (Map.Entry<CodeComment, PlanarRange> entry: commentsModel.getObject().entrySet()) {
+ CodeComment comment = entry.getKey();
+ PlanarRange textRange = entry.getValue();
+ int line = textRange.getFromRow();
+ List<CommentInfo> commentInfosAtLine = commentInfos.get(line);
+ if (commentInfosAtLine == null) {
+ commentInfosAtLine = new ArrayList<>();
+ commentInfos.put(line, commentInfosAtLine);
+ }
+ CommentInfo commentInfo = new CommentInfo();
+ commentInfo.id = comment.getId();
+ commentInfo.mark = textRange;
+ commentInfosAtLine.add(commentInfo);
+ }
+ for (List<CommentInfo> value: commentInfos.values()) {
+ value.sort((o1, o2)->(int)(o1.id-o2.id));
+ }
+
+ String jsonOfCommentInfos;
+ try {
+ jsonOfCommentInfos = OneDev.getInstance(ObjectMapper.class).writeValueAsString(commentInfos);
+ } catch (JsonProcessingException e) {
+ throw new RuntimeException(e);
+ }
+
+ PlanarRange mark = SourceRendererProvider.getRange(context.getPosition());
+ String jsonOfMark = mark!=null? getJson(mark): "undefined";
+
+ CharSequence callback = ajaxBehavior.getCallbackFunction(
+ explicit("action"), explicit("param1"), explicit("param2"),
+ explicit("param3"), explicit("param4"));
+
+ String script = String.format("onedev.server.sourceView.onDomReady('%s', '%s', %s, %s, '%s', '%s', "
+ + "%s, %s, %s, %s, %s, '%s');",
+ JavaScriptEscape.escapeJavaScript(context.getBlobIdent().path),
+ JavaScriptEscape.escapeJavaScript(blob.getText().getContent()),
+ context.getOpenComment()!=null?getJsonOfComment(context.getOpenComment()):"undefined",
+ jsonOfMark,
+ symbolTooltip.getMarkupId(),
+ context.getBlobIdent().revision,
+ jsonOfBlameInfos,
+ jsonOfCommentInfos,
+ callback,
+ blameMessageBehavior.getCallback(),
+ sourceFormat.getTabSize(),
+ sourceFormat.getLineWrapMode());
+ response.render(OnDomReadyHeaderItem.forScript(script));
+
+ script = String.format("onedev.server.sourceView.onWindowLoad(%s);", jsonOfMark);
+ response.render(OnLoadHeaderItem.forScript(script));
+ }
+
+ @Override
+ protected void onDetach() {
+ commentsModel.detach();
+ super.onDetach();
+ }
+
+ @SuppressWarnings("unused")
+ private static class BlameInfo {
+
+ String abbreviatedHash;
+
+ String hash;
+
+ String url;
+
+ String authorName;
+
+ String commitDate;
+
+ List<LinearRange> ranges;
+ }
+
+ private String getSymbolId(List<Symbol> symbols, Symbol symbol) {
+ return "outline-symbol-" + symbols.indexOf(symbol);
+ }
+
+ @SuppressWarnings("unused")
+ private static class CommentInfo {
+ long id;
+
+ String title;
+
+ PlanarRange mark;
+ }
+
+ @Override
+ protected boolean isEditSupported() {
+ return true;
+ }
+
+ @Override
+ public void position(AjaxRequestTarget target, String position) {
+ String script;
+ PlanarRange mark = SourceRendererProvider.getRange(position);
+ if (mark != null) {
+ script = String.format("onedev.server.sourceView.mark(%s);", getJson(mark));
+ } else {
+ script = String.format("onedev.server.sourceView.mark(undefined);");
+ }
+ target.appendJavaScript(script);
+ }
+
+ private ITreeProvider<Symbol> newSymbolTreeProvider(List<Symbol> symbols) {
+ return new ITreeProvider<Symbol>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public Iterator<? extends Symbol> getRoots() {
+ return getChildSymbols(symbols, null).iterator();
+ }
+
+ @Override
+ public boolean hasChildren(Symbol symbol) {
+ return !getChildSymbols(symbols, symbol).isEmpty();
+ }
+
+ @Override
+ public Iterator<? extends Symbol> getChildren(Symbol symbol) {
+ return getChildSymbols(symbols, symbol).iterator();
+ }
+
+ @Override
+ public IModel<Symbol> model(Symbol symbol) {
+ return Model.of(symbol);
+ }
+
+ };
+ }
+
+ private NestedTree<Symbol> newOutlineSearchSymbolTree(ModalPanel modal, List<Symbol> symbols,
+ @Nullable String searchInput) {
+ IModel<HashSet<Symbol>> state;
+ if (StringUtils.isNotBlank(searchInput)) {
+ state = new Model<HashSet<Symbol>>(new HashSet<>(symbols));
+ } else {
+ state = new Model<HashSet<Symbol>>(new HashSet<>(getChildSymbols(symbols, null)));
+ }
+ NestedTree<Symbol> tree = new NestedTree<Symbol>("result", newSymbolTreeProvider(symbols), state) {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(new HumanTheme());
+ }
+
+ @Override
+ protected Component newContentComponent(String id, IModel<Symbol> nodeModel) {
+ Symbol symbol = nodeModel.getObject();
+
+ Fragment fragment = new Fragment(id, "outlineSearchNodeFrag", SourceViewPanel.this);
+ fragment.setOutputMarkupId(true);
+
+ AjaxLink<Void> link = new ViewStateAwareAjaxLink<Void>("link") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ modal.close();
+ context.onSelect(target, context.getBlobIdent(), SourceRendererProvider.getPosition(symbol.getPosition()));
+ }
+
+ };
+ link.add(symbol.renderIcon("icon"));
+ link.add(symbol.render("label", null));
+ link.add(AttributeAppender.append("data-symbolindex", symbols.indexOf(symbol)));
+
+ fragment.add(link);
+
+ if (symbol == symbols.get(0)) {
+ link.add(AttributeAppender.append("class", "active"));
+ }
+
+ return fragment;
+ }
+
+ };
+
+ tree.setOutputMarkupId(true);
+
+ return tree;
+ }
+
+ private void closeComment(AjaxRequestTarget target) {
+ clearComment(target);
+ if (context.getOpenComment() != null)
+ context.onCommentOpened(target, null);
+ target.appendJavaScript("onedev.server.sourceView.onCloseComment();");
+ }
+
+ private Component newOutlineSearchPanel(String id, ModalPanel modal) {
+ Fragment fragment = new Fragment(id, "outlineSearchFrag", SourceViewPanel.this);
+ fragment.add(new AjaxLink<Void>("close") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ modal.close();
+ }
+
+ });
+
+ TextField<String> searchField = new TextField<>("input");
+ fragment.add(searchField);
+ fragment.add(newOutlineSearchSymbolTree(modal, symbols, null));
+
+ fragment.add(new AbstractPostAjaxBehavior() {
+
+ private List<Symbol> filteredSymbols = new ArrayList<Symbol>(symbols);
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.setChannel(new AjaxChannel("outline-search-input", AjaxChannel.Type.DROP));
+ }
+
+ @Override
+ protected void respond(AjaxRequestTarget target) {
+ IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();
+ String key = params.getParameterValue("key").toString();
+
+ if (key.equals("input")) {
+ String searchInput = params.getParameterValue("param").toString();
+
+ MatchScoreProvider<Symbol> matchScoreProvider = new MatchScoreProvider<Symbol>() {
+
+ @Override
+ public double getMatchScore(Symbol object) {
+ return MatchScoreUtils.getMatchScore(object.getName(), searchInput);
+ }
+
+ };
+
+ List<Symbol> matchSymbols = MatchScoreUtils.filterAndSort(symbols, matchScoreProvider);
+
+ filteredSymbols = new ArrayList<>();
+ for (Symbol symbol: matchSymbols) {
+ Symbol current = symbol;
+ while (current != null) {
+ if (!filteredSymbols.contains(current))
+ filteredSymbols.add(current);
+ current = current.getOutlineParent();
+ }
+ }
+
+ NestedTree<Symbol> tree = newOutlineSearchSymbolTree(modal, filteredSymbols, searchInput);
+ fragment.replace(tree);
+ target.add(tree);
+ } else if (key.equals("return")) {
+ int symbolIndex = params.getParameterValue("param").toInt();
+ Symbol symbol = filteredSymbols.get(symbolIndex);
+ context.onSelect(target, context.getBlobIdent(), SourceRendererProvider.getPosition(symbol.getPosition()));
+ modal.close();
+ } else {
+ throw new IllegalStateException("Unrecognized key: " + key);
+ }
+ }
+
+ @Override
+ public void renderHead(Component component, IHeaderResponse response) {
+ super.renderHead(component, response);
+ String script = String.format(
+ "onedev.server.sourceView.onOutlineSearchDomReady('%s', %s);",
+ fragment.getMarkupId(),
+ getCallbackFunction(explicit("key"), explicit("param")));
+
+ response.render(OnDomReadyHeaderItem.forScript(script));
+ }
+
+ });
+ fragment.setOutputMarkupId(true);
+
+ return fragment;
+ }
+
+ @Override
+ public List<MenuItem> getMenuItems(FloatingPanel dropdown) {
+ List<MenuItem> menuItems = new ArrayList<>();
+ if (hasOutline()) {
+ menuItems.add(new MenuItem() {
+
+ @Override
+ public String getShortcut() {
+ return "O";
+ }
+
+ @Override
+ public String getLabel() {
+ return "Outline Search";
+ }
+
+ @Override
+ public WebMarkupContainer newLink(String id) {
+ return new ModalLink(id) {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ super.onClick(target);
+ dropdown.close();
+ }
+
+ @Override
+ protected Component newContent(String id, ModalPanel modal) {
+ return newOutlineSearchPanel(id, modal);
+ }
+
+ };
+ }
+
+ });
+ }
+ return menuItems;
+ }
+
+ @Override
+ protected boolean isViewPlainSupported() {
+ return viewPlainMode;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.java
index 8a42693ea8..b88a507284 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.java
@@ -28,7 +28,7 @@ import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
import io.onedev.server.web.ajaxlistener.TrackViewStateListener;
import io.onedev.server.web.component.link.ViewStateAwareAjaxLink;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java
index 8a4f3c7d1f..05ab4cfb10 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java
@@ -70,8 +70,8 @@ import io.onedev.server.model.support.ProjectAndBranch;
import io.onedev.server.search.entity.pullrequest.OpenCriteria;
import io.onedev.server.search.entity.pullrequest.PullRequestQuery;
import io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer;
-import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.PullRequestConstants;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.behavior.OnTypingDoneBehavior;
import io.onedev.server.web.component.branch.choice.BranchChoiceProvider;
import io.onedev.server.web.component.branch.choice.BranchSingleChoice;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.java
index a9b25f8253..4dcd1218ef 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.java
@@ -19,7 +19,7 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.support.NamedBuildQuery;
import io.onedev.server.model.support.QuerySetting;
import io.onedev.server.search.entity.build.BuildQuery;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.component.build.list.BuildListPanel;
import io.onedev.server.web.component.modal.ModalPanel;
import io.onedev.server.web.page.project.ProjectPage;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java
index 5fcf3b3bb2..44a3a8a1ce 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java
@@ -41,7 +41,7 @@ import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.git.GitUtils;
import io.onedev.server.model.Build;
import io.onedev.server.model.Build.Status;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.inputspec.InputContext;
import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.web.behavior.WebSocketObserver;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/ProjectCodeCommentsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/ProjectCodeCommentsPage.java
index ec0da2ba93..ddec7b417d 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/ProjectCodeCommentsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/ProjectCodeCommentsPage.java
@@ -19,7 +19,7 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.support.NamedCodeCommentQuery;
import io.onedev.server.model.support.QuerySetting;
import io.onedev.server.search.entity.codecomment.CodeCommentQuery;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.component.codecomment.CodeCommentListPanel;
import io.onedev.server.web.component.modal.ModalPanel;
import io.onedev.server.web.page.project.ProjectPage;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java
index 914c3aeed8..18cb73b7b4 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java
@@ -58,8 +58,8 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.support.MarkPos;
import io.onedev.server.search.code.CommitIndexed;
-import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.CommitMessageTransformer;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.diff.WhitespaceOption;
import io.onedev.server.web.behavior.WebSocketObserver;
import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java
index ead8fd8cf6..d9c222b444 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java
@@ -1,215 +1,215 @@
-package io.onedev.server.web.page.project.commits;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.annotation.Nullable;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.markup.html.link.BookmarkablePageLink;
-import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.CommitQuerySettingManager;
-import io.onedev.server.entitymanager.ProjectManager;
-import io.onedev.server.model.CommitQuerySetting;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.support.NamedCommitQuery;
-import io.onedev.server.model.support.QuerySetting;
-import io.onedev.server.search.commit.CommitQuery;
-import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.web.component.commit.list.CommitListPanel;
-import io.onedev.server.web.component.modal.ModalPanel;
-import io.onedev.server.web.page.project.ProjectPage;
-import io.onedev.server.web.page.project.savedquery.NamedQueriesBean;
-import io.onedev.server.web.page.project.savedquery.SaveQueryPanel;
-import io.onedev.server.web.page.project.savedquery.SavedQueriesPanel;
-import io.onedev.server.web.util.QuerySaveSupport;
-
-@SuppressWarnings("serial")
-public class ProjectCommitsPage extends ProjectPage {
-
- private static final String PARAM_COMPARE_WITH = "compareWith";
-
- private static final String PARAM_COMMIT_QUERY = "commitQuery";
-
- private String query;
-
- private String compareWith;
-
- public ProjectCommitsPage(PageParameters params) {
- super(params);
-
- compareWith = params.get(PARAM_COMPARE_WITH).toString();
-
- query = params.get(PARAM_COMMIT_QUERY).toString();
- if (query != null && query.length() == 0) {
- query = null;
- List<String> queries = new ArrayList<>();
- if (getProject().getCommitQuerySettingOfCurrentUser() != null) {
- for (NamedCommitQuery namedQuery: getProject().getCommitQuerySettingOfCurrentUser().getUserQueries())
- queries.add(namedQuery.getQuery());
- }
- for (NamedCommitQuery namedQuery: getProject().getSavedCommitQueries())
- queries.add(namedQuery.getQuery());
- for (String each: queries) {
- try {
- if (SecurityUtils.getUser() != null || !CommitQuery.parse(getProject(), each).needsLogin()) {
- query = each;
- break;
- }
- } catch (Exception e) {
- }
- }
- }
- }
-
- private CommitQuerySettingManager getCommitQuerySettingManager() {
- return OneDev.getInstance(CommitQuerySettingManager.class);
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- SavedQueriesPanel<NamedCommitQuery> savedQueries;
- add(savedQueries = new SavedQueriesPanel<NamedCommitQuery>("side") {
-
- @Override
- protected NamedQueriesBean<NamedCommitQuery> newNamedQueriesBean() {
- return new NamedCommitQueriesBean();
- }
-
- @Override
- protected boolean needsLogin(NamedCommitQuery namedQuery) {
- return CommitQuery.parse(getProject(), namedQuery.getQuery()).needsLogin();
- }
-
- @Override
- protected Link<Void> newQueryLink(String componentId, NamedCommitQuery namedQuery) {
- query = namedQuery.getQuery();
- return new BookmarkablePageLink<Void>(componentId, ProjectCommitsPage.class,
- ProjectCommitsPage.paramsOf(getProject(), query, compareWith));
- }
-
- @Override
- protected QuerySetting<NamedCommitQuery> getQuerySetting() {
- return getProject().getCommitQuerySettingOfCurrentUser();
- }
-
- @Override
- protected ArrayList<NamedCommitQuery> getProjectQueries() {
- return getProject().getSavedCommitQueries();
- }
-
- @Override
- protected void onSaveQuerySetting(QuerySetting<NamedCommitQuery> querySetting) {
- getCommitQuerySettingManager().save((CommitQuerySetting) querySetting);
- }
-
- @Override
- protected void onSaveProjectQueries(ArrayList<NamedCommitQuery> projectQueries) {
- getProject().setSavedCommitQueries(projectQueries);
- OneDev.getInstance(ProjectManager.class).save(getProject());
- }
-
- });
-
- add(new CommitListPanel("main", getProject(), query) {
-
- @Override
- protected void onQueryUpdated(AjaxRequestTarget target, String query) {
- setResponsePage(ProjectCommitsPage.class, paramsOf(getProject(), query, compareWith));
- }
-
- @Override
- protected QuerySaveSupport getQuerySaveSupport() {
- return new QuerySaveSupport() {
-
- @Override
- public void onSaveQuery(AjaxRequestTarget target, String query) {
- new ModalPanel(target) {
-
- @Override
- protected Component newContent(String id) {
- return new SaveQueryPanel(id) {
-
- @Override
- protected void onSaveForMine(AjaxRequestTarget target, String name) {
- CommitQuerySetting setting = getProject().getCommitQuerySettingOfCurrentUser();
- NamedCommitQuery namedQuery = setting.getUserQuery(name);
- if (namedQuery == null) {
- namedQuery = new NamedCommitQuery(name, query);
- setting.getUserQueries().add(namedQuery);
- } else {
- namedQuery.setQuery(query);
- }
- getCommitQuerySettingManager().save(setting);
- target.add(savedQueries);
- close();
- }
-
- @Override
- protected void onSaveForAll(AjaxRequestTarget target, String name) {
- NamedCommitQuery namedQuery = getProject().getSavedCommitQuery(name);
- if (namedQuery == null) {
- namedQuery = new NamedCommitQuery(name, query);
- getProject().getSavedCommitQueries().add(namedQuery);
- } else {
- namedQuery.setQuery(query);
- }
- OneDev.getInstance(ProjectManager.class).save(getProject());
- target.add(savedQueries);
- close();
- }
-
- @Override
- protected void onCancel(AjaxRequestTarget target) {
- close();
- }
-
- };
- }
-
- };
- }
-
- @Override
- public boolean isSavedQueriesVisible() {
- savedQueries.configure();
- return savedQueries.isVisible();
- }
-
- };
- }
-
- @Override
- protected String getCompareWith() {
- return compareWith;
- }
-
- });
- }
-
- public static PageParameters paramsOf(Project project, @Nullable String query, @Nullable String compareWith) {
- PageParameters params = paramsOf(project);
- if (compareWith != null)
- params.set(PARAM_COMPARE_WITH, compareWith);
- if (query != null)
- params.set(PARAM_COMMIT_QUERY, query);
- return params;
- }
-
- @Override
- protected String getRobotsMeta() {
- return "noindex,nofollow";
- }
-
- @Override
- protected boolean isPermitted() {
- return SecurityUtils.canReadCode(getProject().getFacade());
- }
-
+package io.onedev.server.web.page.project.commits;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.annotation.Nullable;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.CommitQuerySettingManager;
+import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.model.CommitQuerySetting;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.support.NamedCommitQuery;
+import io.onedev.server.model.support.QuerySetting;
+import io.onedev.server.search.commit.CommitQuery;
+import io.onedev.server.util.SecurityUtils;
+import io.onedev.server.web.component.commit.list.CommitListPanel;
+import io.onedev.server.web.component.modal.ModalPanel;
+import io.onedev.server.web.page.project.ProjectPage;
+import io.onedev.server.web.page.project.savedquery.NamedQueriesBean;
+import io.onedev.server.web.page.project.savedquery.SaveQueryPanel;
+import io.onedev.server.web.page.project.savedquery.SavedQueriesPanel;
+import io.onedev.server.web.util.QuerySaveSupport;
+
+@SuppressWarnings("serial")
+public class ProjectCommitsPage extends ProjectPage {
+
+ private static final String PARAM_COMPARE_WITH = "compareWith";
+
+ private static final String PARAM_COMMIT_QUERY = "commitQuery";
+
+ private String query;
+
+ private String compareWith;
+
+ public ProjectCommitsPage(PageParameters params) {
+ super(params);
+
+ compareWith = params.get(PARAM_COMPARE_WITH).toString();
+
+ query = params.get(PARAM_COMMIT_QUERY).toString();
+ if (query != null && query.length() == 0) {
+ query = null;
+ List<String> queries = new ArrayList<>();
+ if (getProject().getCommitQuerySettingOfCurrentUser() != null) {
+ for (NamedCommitQuery namedQuery: getProject().getCommitQuerySettingOfCurrentUser().getUserQueries())
+ queries.add(namedQuery.getQuery());
+ }
+ for (NamedCommitQuery namedQuery: getProject().getSavedCommitQueries())
+ queries.add(namedQuery.getQuery());
+ for (String each: queries) {
+ try {
+ if (SecurityUtils.getUser() != null || !CommitQuery.parse(getProject(), each).needsLogin()) {
+ query = each;
+ break;
+ }
+ } catch (Exception e) {
+ }
+ }
+ }
+ }
+
+ private CommitQuerySettingManager getCommitQuerySettingManager() {
+ return OneDev.getInstance(CommitQuerySettingManager.class);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ SavedQueriesPanel<NamedCommitQuery> savedQueries;
+ add(savedQueries = new SavedQueriesPanel<NamedCommitQuery>("side") {
+
+ @Override
+ protected NamedQueriesBean<NamedCommitQuery> newNamedQueriesBean() {
+ return new NamedCommitQueriesBean();
+ }
+
+ @Override
+ protected boolean needsLogin(NamedCommitQuery namedQuery) {
+ return CommitQuery.parse(getProject(), namedQuery.getQuery()).needsLogin();
+ }
+
+ @Override
+ protected Link<Void> newQueryLink(String componentId, NamedCommitQuery namedQuery) {
+ query = namedQuery.getQuery();
+ return new BookmarkablePageLink<Void>(componentId, ProjectCommitsPage.class,
+ ProjectCommitsPage.paramsOf(getProject(), query, compareWith));
+ }
+
+ @Override
+ protected QuerySetting<NamedCommitQuery> getQuerySetting() {
+ return getProject().getCommitQuerySettingOfCurrentUser();
+ }
+
+ @Override
+ protected ArrayList<NamedCommitQuery> getProjectQueries() {
+ return getProject().getSavedCommitQueries();
+ }
+
+ @Override
+ protected void onSaveQuerySetting(QuerySetting<NamedCommitQuery> querySetting) {
+ getCommitQuerySettingManager().save((CommitQuerySetting) querySetting);
+ }
+
+ @Override
+ protected void onSaveProjectQueries(ArrayList<NamedCommitQuery> projectQueries) {
+ getProject().setSavedCommitQueries(projectQueries);
+ OneDev.getInstance(ProjectManager.class).save(getProject());
+ }
+
+ });
+
+ add(new CommitListPanel("main", getProject(), query) {
+
+ @Override
+ protected void onQueryUpdated(AjaxRequestTarget target, String query) {
+ setResponsePage(ProjectCommitsPage.class, paramsOf(getProject(), query, compareWith));
+ }
+
+ @Override
+ protected QuerySaveSupport getQuerySaveSupport() {
+ return new QuerySaveSupport() {
+
+ @Override
+ public void onSaveQuery(AjaxRequestTarget target, String query) {
+ new ModalPanel(target) {
+
+ @Override
+ protected Component newContent(String id) {
+ return new SaveQueryPanel(id) {
+
+ @Override
+ protected void onSaveForMine(AjaxRequestTarget target, String name) {
+ CommitQuerySetting setting = getProject().getCommitQuerySettingOfCurrentUser();
+ NamedCommitQuery namedQuery = setting.getUserQuery(name);
+ if (namedQuery == null) {
+ namedQuery = new NamedCommitQuery(name, query);
+ setting.getUserQueries().add(namedQuery);
+ } else {
+ namedQuery.setQuery(query);
+ }
+ getCommitQuerySettingManager().save(setting);
+ target.add(savedQueries);
+ close();
+ }
+
+ @Override
+ protected void onSaveForAll(AjaxRequestTarget target, String name) {
+ NamedCommitQuery namedQuery = getProject().getSavedCommitQuery(name);
+ if (namedQuery == null) {
+ namedQuery = new NamedCommitQuery(name, query);
+ getProject().getSavedCommitQueries().add(namedQuery);
+ } else {
+ namedQuery.setQuery(query);
+ }
+ OneDev.getInstance(ProjectManager.class).save(getProject());
+ target.add(savedQueries);
+ close();
+ }
+
+ @Override
+ protected void onCancel(AjaxRequestTarget target) {
+ close();
+ }
+
+ };
+ }
+
+ };
+ }
+
+ @Override
+ public boolean isSavedQueriesVisible() {
+ savedQueries.configure();
+ return savedQueries.isVisible();
+ }
+
+ };
+ }
+
+ @Override
+ protected String getCompareWith() {
+ return compareWith;
+ }
+
+ });
+ }
+
+ public static PageParameters paramsOf(Project project, @Nullable String query, @Nullable String compareWith) {
+ PageParameters params = paramsOf(project);
+ if (compareWith != null)
+ params.set(PARAM_COMPARE_WITH, compareWith);
+ if (query != null)
+ params.set(PARAM_COMMIT_QUERY, query);
+ return params;
+ }
+
+ @Override
+ protected String getRobotsMeta() {
+ return "noindex,nofollow";
+ }
+
+ @Override
+ protected boolean isPermitted() {
+ return SecurityUtils.canReadCode(getProject().getFacade());
+ }
+
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java
index 533a82b244..5b3cc7da2c 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java
@@ -42,7 +42,7 @@ import io.onedev.server.search.code.CommitIndexed;
import io.onedev.server.search.commit.CommitQuery;
import io.onedev.server.search.commit.Revision;
import io.onedev.server.search.commit.RevisionCriteria;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.diff.WhitespaceOption;
import io.onedev.server.web.component.commit.list.CommitListPanel;
import io.onedev.server.web.component.diff.revision.CommentSupport;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/info/ForkOptionPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/info/ForkOptionPanel.java
index feedd8c50b..b6ab15b1bd 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/info/ForkOptionPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/info/ForkOptionPanel.java
@@ -13,7 +13,7 @@ import com.google.common.collect.Lists;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.model.Project;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.editable.BeanEditor;
import io.onedev.server.web.editable.PathElement;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.java
index 6e9a6496c5..c2c04cf36b 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.java
@@ -1,215 +1,215 @@
-package io.onedev.server.web.page.project.info;
-
-import java.util.Collection;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.form.TextField;
-import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
-import org.apache.wicket.model.Model;
-import org.eclipse.jgit.lib.Constants;
-
-import io.onedev.server.OneDev;
-import io.onedev.server.cache.CommitInfoManager;
-import io.onedev.server.entitymanager.UrlManager;
-import io.onedev.server.model.Project;
-import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;
-import io.onedev.server.web.component.floating.FloatingPanel;
-import io.onedev.server.web.component.link.DropdownLink;
-import io.onedev.server.web.component.link.ViewStateAwarePageLink;
-import io.onedev.server.web.component.markdown.MarkdownViewer;
-import io.onedev.server.web.component.modal.ModalLink;
-import io.onedev.server.web.component.modal.ModalPanel;
-import io.onedev.server.web.component.project.selector.ProjectSelector;
-import io.onedev.server.web.page.project.blob.ProjectBlobPage;
-import io.onedev.server.web.page.project.branches.ProjectBranchesPage;
-import io.onedev.server.web.page.project.commits.ProjectCommitsPage;
-import io.onedev.server.web.page.project.tags.ProjectTagsPage;
-
-@SuppressWarnings("serial")
-public abstract class ProjectInfoPanel extends Panel {
-
- private final IModel<Project> projectModel;
-
- public ProjectInfoPanel(String id, IModel<Project> projectModel) {
- super(id);
- this.projectModel = projectModel;
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- if (getProject().getForkedFrom() != null) {
- Link<Void> link = new ViewStateAwarePageLink<Void>("forkedFromLink",
- ProjectBlobPage.class, ProjectBlobPage.paramsOf(getProject().getForkedFrom())) {
-
- @Override
- protected void onComponentTag(ComponentTag tag) {
- super.onComponentTag(tag);
- if (!isEnabled())
- tag.setName("span");
- }
-
- };
- link.add(new Label("name", getProject().getForkedFrom().getName()));
- link.setEnabled(SecurityUtils.canReadCode(getProject().getForkedFrom().getFacade()));
- add(link);
- } else {
- WebMarkupContainer link = new WebMarkupContainer("forkedFromLink");
- link.add(new Label("name"));
- link.setVisible(false);
- add(link);
- }
- add(new Label("name", getProject().getName()));
- add(new Label("id", getProject().getId()));
-
- UrlManager urlManager = OneDev.getInstance(UrlManager.class);
- Model<String> cloneUrlModel = Model.of(urlManager.urlFor(getProject()));
- add(new TextField<String>("cloneUrl", cloneUrlModel));
- add(new WebMarkupContainer("copyUrl").add(new CopyClipboardBehavior(cloneUrlModel)));
-
- if (getProject().getDescription() != null) {
- add(new MarkdownViewer("description", Model.of(getProject().getDescription()), null));
- } else {
- add(new WebMarkupContainer("description").setVisible(false));
- }
-
- add(new ViewStateAwarePageLink<Void>("commitsLink",
- ProjectCommitsPage.class, ProjectCommitsPage.paramsOf(getProject())) {
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setVisible(OneDev.getInstance(CommitInfoManager.class).getCommitCount(getProject()) != 0);
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- CommitInfoManager commitInfoManager = OneDev.getInstance(CommitInfoManager.class);
- add(new Label("count", commitInfoManager.getCommitCount(getProject()) + " commits"));
- }
-
- });
-
- add(new ViewStateAwarePageLink<Void>("branchesLink",
- ProjectBranchesPage.class, ProjectBranchesPage.paramsOf(getProject())) {
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- add(new Label("count", getProject().getRefs(Constants.R_HEADS).size() + " branches"));
- }
-
- });
-
- add(new ViewStateAwarePageLink<Void>("tagsLink",
- ProjectTagsPage.class, ProjectTagsPage.paramsOf(getProject())) {
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- add(new Label("count", getProject().getRefs(Constants.R_TAGS).size() + " tags"));
- }
-
- });
-
- if (getProject().getForks().isEmpty()) {
- add(new WebMarkupContainer("forks") {
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- add(new Label("label", "0 forks"));
- }
-
- @Override
- protected void onComponentTag(ComponentTag tag) {
- super.onComponentTag(tag);
- tag.setName("span");
- }
-
- });
- } else {
- add(new DropdownLink("forks") {
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- add(new Label("label", getProject().getForks().size() + " forks <i class='fa fa-caret-down'></i>").setEscapeModelStrings(false));
- }
-
- @Override
- protected Component newContent(String id, FloatingPanel dropdown) {
- return new ProjectSelector(id, new LoadableDetachableModel<Collection<Project>>() {
-
- @Override
- protected Collection<Project> load() {
- return getProject().getForks();
- }
-
- }, Project.idOf(getProject())) {
-
- @Override
- protected void onSelect(AjaxRequestTarget target, Project project) {
- setResponsePage(ProjectBlobPage.class, ProjectBlobPage.paramsOf(project));
- }
-
- };
- }
-
- });
- }
-
- add(new ModalLink("forkNow") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- super.onClick(target);
- onPromptForkOption(target);
- }
-
- @Override
- protected Component newContent(String id, ModalPanel modal) {
- return new ForkOptionPanel(id, projectModel) {
-
- @Override
- protected void onClose(AjaxRequestTarget target) {
- modal.close();
- }
-
- };
- }
-
- }.setVisible(SecurityUtils.canCreateProjects()));
- }
-
- private Project getProject() {
- return projectModel.getObject();
- }
-
- @Override
- protected void onDetach() {
- projectModel.detach();
- super.onDetach();
- }
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new ProjectInfoResourceReference()));
- }
-
- protected abstract void onPromptForkOption(AjaxRequestTarget target);
-
-}
+package io.onedev.server.web.page.project.info;
+
+import java.util.Collection;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.model.Model;
+import org.eclipse.jgit.lib.Constants;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.cache.CommitInfoManager;
+import io.onedev.server.entitymanager.UrlManager;
+import io.onedev.server.model.Project;
+import io.onedev.server.util.SecurityUtils;
+import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;
+import io.onedev.server.web.component.floating.FloatingPanel;
+import io.onedev.server.web.component.link.DropdownLink;
+import io.onedev.server.web.component.link.ViewStateAwarePageLink;
+import io.onedev.server.web.component.markdown.MarkdownViewer;
+import io.onedev.server.web.component.modal.ModalLink;
+import io.onedev.server.web.component.modal.ModalPanel;
+import io.onedev.server.web.component.project.selector.ProjectSelector;
+import io.onedev.server.web.page.project.blob.ProjectBlobPage;
+import io.onedev.server.web.page.project.branches.ProjectBranchesPage;
+import io.onedev.server.web.page.project.commits.ProjectCommitsPage;
+import io.onedev.server.web.page.project.tags.ProjectTagsPage;
+
+@SuppressWarnings("serial")
+public abstract class ProjectInfoPanel extends Panel {
+
+ private final IModel<Project> projectModel;
+
+ public ProjectInfoPanel(String id, IModel<Project> projectModel) {
+ super(id);
+ this.projectModel = projectModel;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ if (getProject().getForkedFrom() != null) {
+ Link<Void> link = new ViewStateAwarePageLink<Void>("forkedFromLink",
+ ProjectBlobPage.class, ProjectBlobPage.paramsOf(getProject().getForkedFrom())) {
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ if (!isEnabled())
+ tag.setName("span");
+ }
+
+ };
+ link.add(new Label("name", getProject().getForkedFrom().getName()));
+ link.setEnabled(SecurityUtils.canReadCode(getProject().getForkedFrom().getFacade()));
+ add(link);
+ } else {
+ WebMarkupContainer link = new WebMarkupContainer("forkedFromLink");
+ link.add(new Label("name"));
+ link.setVisible(false);
+ add(link);
+ }
+ add(new Label("name", getProject().getName()));
+ add(new Label("id", getProject().getId()));
+
+ UrlManager urlManager = OneDev.getInstance(UrlManager.class);
+ Model<String> cloneUrlModel = Model.of(urlManager.urlFor(getProject()));
+ add(new TextField<String>("cloneUrl", cloneUrlModel));
+ add(new WebMarkupContainer("copyUrl").add(new CopyClipboardBehavior(cloneUrlModel)));
+
+ if (getProject().getDescription() != null) {
+ add(new MarkdownViewer("description", Model.of(getProject().getDescription()), null));
+ } else {
+ add(new WebMarkupContainer("description").setVisible(false));
+ }
+
+ add(new ViewStateAwarePageLink<Void>("commitsLink",
+ ProjectCommitsPage.class, ProjectCommitsPage.paramsOf(getProject())) {
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(OneDev.getInstance(CommitInfoManager.class).getCommitCount(getProject()) != 0);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ CommitInfoManager commitInfoManager = OneDev.getInstance(CommitInfoManager.class);
+ add(new Label("count", commitInfoManager.getCommitCount(getProject()) + " commits"));
+ }
+
+ });
+
+ add(new ViewStateAwarePageLink<Void>("branchesLink",
+ ProjectBranchesPage.class, ProjectBranchesPage.paramsOf(getProject())) {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(new Label("count", getProject().getRefs(Constants.R_HEADS).size() + " branches"));
+ }
+
+ });
+
+ add(new ViewStateAwarePageLink<Void>("tagsLink",
+ ProjectTagsPage.class, ProjectTagsPage.paramsOf(getProject())) {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(new Label("count", getProject().getRefs(Constants.R_TAGS).size() + " tags"));
+ }
+
+ });
+
+ if (getProject().getForks().isEmpty()) {
+ add(new WebMarkupContainer("forks") {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(new Label("label", "0 forks"));
+ }
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ tag.setName("span");
+ }
+
+ });
+ } else {
+ add(new DropdownLink("forks") {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(new Label("label", getProject().getForks().size() + " forks <i class='fa fa-caret-down'></i>").setEscapeModelStrings(false));
+ }
+
+ @Override
+ protected Component newContent(String id, FloatingPanel dropdown) {
+ return new ProjectSelector(id, new LoadableDetachableModel<Collection<Project>>() {
+
+ @Override
+ protected Collection<Project> load() {
+ return getProject().getForks();
+ }
+
+ }, Project.idOf(getProject())) {
+
+ @Override
+ protected void onSelect(AjaxRequestTarget target, Project project) {
+ setResponsePage(ProjectBlobPage.class, ProjectBlobPage.paramsOf(project));
+ }
+
+ };
+ }
+
+ });
+ }
+
+ add(new ModalLink("forkNow") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ super.onClick(target);
+ onPromptForkOption(target);
+ }
+
+ @Override
+ protected Component newContent(String id, ModalPanel modal) {
+ return new ForkOptionPanel(id, projectModel) {
+
+ @Override
+ protected void onClose(AjaxRequestTarget target) {
+ modal.close();
+ }
+
+ };
+ }
+
+ }.setVisible(SecurityUtils.canCreateProjects()));
+ }
+
+ private Project getProject() {
+ return projectModel.getObject();
+ }
+
+ @Override
+ protected void onDetach() {
+ projectModel.detach();
+ super.onDetach();
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(CssHeaderItem.forReference(new ProjectInfoResourceReference()));
+ }
+
+ protected abstract void onPromptForkOption(AjaxRequestTarget target);
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java
index 68fc8fa976..390e78a72e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java
@@ -30,7 +30,7 @@ import io.onedev.server.model.Project;
import io.onedev.server.search.entity.issue.IssueCriteria;
import io.onedev.server.search.entity.issue.IssueQuery;
import io.onedev.server.search.entity.issue.MilestoneCriteria;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
import io.onedev.server.web.component.modal.ModalLink;
import io.onedev.server.web.component.modal.ModalPanel;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java
index 84337ac7bf..6beda9ed2e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java
@@ -25,8 +25,8 @@ import io.onedev.server.entitymanager.IssueManager;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.User;
-import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.IssueConstants;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.Input;
import io.onedev.server.util.facade.UserFacade;
import io.onedev.server.util.inputspec.InputSpec;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java
index dffc061b00..8eb189c1d4 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java
@@ -1,448 +1,448 @@
-package io.onedev.server.web.page.project.issues.boards;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.concurrent.atomic.AtomicReference;
-
-import javax.annotation.Nullable;
-
-import org.apache.commons.lang3.SerializationUtils;
-import org.apache.shiro.authz.UnauthorizedException;
-import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.attributes.CallbackParameter;
-import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.event.IEvent;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.link.BookmarkablePageLink;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
-import org.apache.wicket.request.IRequestParameters;
-import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.unbescape.html.HtmlEscape;
-
-import io.onedev.server.OneDev;
-import io.onedev.server.OneException;
-import io.onedev.server.entitymanager.IssueChangeManager;
-import io.onedev.server.entitymanager.IssueManager;
-import io.onedev.server.entitymanager.SettingManager;
-import io.onedev.server.entitymanager.UserManager;
-import io.onedev.server.model.Issue;
-import io.onedev.server.model.Milestone;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.User;
-import io.onedev.server.model.support.issue.BoardSpec;
-import io.onedev.server.model.support.issue.IssueSetting;
-import io.onedev.server.model.support.issue.StateSpec;
-import io.onedev.server.model.support.issue.TransitionSpec;
-import io.onedev.server.model.support.issue.transitiontrigger.PressButtonTrigger;
-import io.onedev.server.model.support.setting.GlobalIssueSetting;
-import io.onedev.server.search.entity.issue.ChoiceFieldCriteria;
-import io.onedev.server.search.entity.issue.FieldOperatorCriteria;
-import io.onedev.server.search.entity.issue.IssueCriteria;
-import io.onedev.server.search.entity.issue.IssueQuery;
-import io.onedev.server.search.entity.issue.IssueQueryLexer;
-import io.onedev.server.search.entity.issue.MilestoneCriteria;
-import io.onedev.server.search.entity.issue.StateCriteria;
-import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.util.EditContext;
-import io.onedev.server.util.IssueConstants;
-import io.onedev.server.util.OneContext;
-import io.onedev.server.util.facade.UserFacade;
-import io.onedev.server.util.inputspec.InputSpec;
-import io.onedev.server.util.inputspec.choiceinput.ChoiceInput;
-import io.onedev.server.util.inputspec.choiceinput.choiceprovider.ChoiceProvider;
-import io.onedev.server.util.inputspec.userchoiceinput.UserChoiceInput;
-import io.onedev.server.util.userident.UserIdent;
-import io.onedev.server.util.usermatcher.UserMatcher;
-import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
-import io.onedev.server.web.component.modal.ModalLink;
-import io.onedev.server.web.component.modal.ModalPanel;
-import io.onedev.server.web.component.user.ident.UserIdentPanel;
-import io.onedev.server.web.component.user.ident.UserIdentPanel.Mode;
-import io.onedev.server.web.page.project.issues.list.IssueListPage;
-
-@SuppressWarnings("serial")
-abstract class BoardColumnPanel extends Panel implements EditContext {
-
- private final IModel<IssueQuery> queryModel = new LoadableDetachableModel<IssueQuery>() {
-
- @Override
- protected IssueQuery load() {
- IssueQuery boardQuery = getBoardQuery();
- if (boardQuery != null) {
- List<IssueCriteria> criterias = new ArrayList<>();
- if (boardQuery.getCriteria() != null)
- criterias.add(boardQuery.getCriteria());
- if (getMilestone() != null)
- criterias.add(new MilestoneCriteria(getMilestone().getName()));
- String identifyField = getBoard().getIdentifyField();
- if (identifyField.equals(IssueConstants.FIELD_STATE)) {
- criterias.add(new StateCriteria(getColumn()));
- } else if (getColumn() != null) {
- criterias.add(new ChoiceFieldCriteria(identifyField,
- getColumn(), -1, IssueQueryLexer.Is, false));
- } else {
- criterias.add(new FieldOperatorCriteria(identifyField, IssueQueryLexer.IsEmpty));
- }
- return new IssueQuery(IssueCriteria.of(criterias), boardQuery.getSorts());
- } else {
- return null;
- }
- }
-
- };
-
- private final IModel<Integer> countModel = new LoadableDetachableModel<Integer>() {
-
- @Override
- protected Integer load() {
- if (getQuery() != null)
- return OneDev.getInstance(IssueManager.class).count(getProject(), SecurityUtils.getUser(), getQuery().getCriteria());
- else
- return 0;
- }
-
- };
-
- private AbstractPostAjaxBehavior ajaxBehavior;
-
- public BoardColumnPanel(String id) {
- super(id);
- }
-
- @Override
- protected void onDetach() {
- queryModel.detach();
- countModel.detach();
- super.onDetach();
- }
-
- private IssueQuery getQuery() {
- return queryModel.getObject();
- }
-
- private GlobalIssueSetting getIssueSetting() {
- return OneDev.getInstance(SettingManager.class).getIssueSetting();
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- WebMarkupContainer content = new WebMarkupContainer("content") {
-
- @Override
- protected void onBeforeRender() {
- addOrReplace(new CardListPanel("body") {
-
- @Override
- public void onEvent(IEvent<?> event) {
- super.onEvent(event);
- if (event.getPayload() instanceof IssueDragging && getQuery() != null) {
- IssueDragging issueDragging = (IssueDragging) event.getPayload();
- Issue issue = issueDragging.getIssue();
- if (Objects.equals(issue.getMilestone(), getMilestone())) {
- // move issue between board columns
- IssueSetting workflow = getProject().getIssueSetting();
- String identifyField = getBoard().getIdentifyField();
- if (identifyField.equals(IssueConstants.FIELD_STATE)) {
- issue = SerializationUtils.clone(issue);
- for (TransitionSpec transition: workflow.getTransitionSpecs(true)) {
- if (transition.canTransite(issue)
- && transition.getTrigger() instanceof PressButtonTrigger
- && ((PressButtonTrigger)transition.getTrigger()).isAuthorized()
- && transition.getToState().equals(getColumn())) {
- issue.setState(getColumn());
- break;
- }
- }
- } else if (SecurityUtils.canWriteCode(issue.getProject().getFacade())) {
- InputSpec fieldSpec = getIssueSetting().getFieldSpec(identifyField);
- UserMatcher userMatcher = UserMatcher.fromString(fieldSpec.getCanBeChangedBy());
- if (fieldSpec != null && userMatcher.matches(getProject(), SecurityUtils.getUser())) {
- issue = SerializationUtils.clone(issue);
- issue.setFieldValue(identifyField, getColumn());
- }
- }
- } else if (SecurityUtils.canWriteCode(issue.getProject().getFacade())) {
- // move issue between backlog column and board column
- issue = SerializationUtils.clone(issue);
- issue.setMilestone(getMilestone());
- }
- if (getQuery().matches(issue, SecurityUtils.getUser())) {
- String script = String.format("$('#%s').addClass('issue-droppable');", getMarkupId());
- issueDragging.getHandler().appendJavaScript(script);
- }
- }
- event.dontBroadcastDeeper();
- }
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- CharSequence callback = ajaxBehavior.getCallbackFunction(CallbackParameter.explicit("issue"));
- String script = String.format("onedev.server.issueBoards.onColumnDomReady('%s', %s);",
- getMarkupId(), getQuery()!=null?callback:"undefined");
- response.render(OnDomReadyHeaderItem.forScript(script));
- }
-
- @Override
- protected Project getProject() {
- return BoardColumnPanel.this.getProject();
- }
-
- @Override
- protected IssueQuery getQuery() {
- return BoardColumnPanel.this.getQuery();
- }
-
- @Override
- protected int getCardCount() {
- return countModel.getObject();
- }
-
- });
-
- super.onBeforeRender();
- }
-
- };
- add(content);
-
- String title;
- String color = null;
- User user = null;
- String identifyField = getBoard().getIdentifyField();
- if (getColumn() != null) {
- title = HtmlEscape.escapeHtml5(getColumn());
- if (identifyField.equals(IssueConstants.FIELD_STATE)) {
- StateSpec stateSpec = getIssueSetting().getStateSpec(getColumn());
- if (stateSpec != null)
- color = stateSpec.getColor();
- } else {
- InputSpec fieldSpec = getIssueSetting().getFieldSpec(identifyField);
- if (fieldSpec instanceof ChoiceInput) {
- ChoiceProvider choiceProvider = ((ChoiceInput)fieldSpec).getChoiceProvider();
- OneContext.push(new OneContext(this));
- try {
- color = choiceProvider.getChoices(true).get(getColumn());
- } finally {
- OneContext.pop();
- }
- } else if (fieldSpec instanceof UserChoiceInput) {
- user = OneDev.getInstance(UserManager.class).findByName(getColumn());
- }
- }
- } else {
- InputSpec fieldSpec = getIssueSetting().getFieldSpec(identifyField);
- if (fieldSpec != null)
- title = "<i>" + HtmlEscape.escapeHtml5(fieldSpec.getNameOfEmptyValue()) + "</i>";
- else
- title = "<i>No value</i>";
- }
-
- WebMarkupContainer head = new WebMarkupContainer("head");
- if (user != null) {
- head.add(new WebMarkupContainer("title").setVisible(false));
- head.add(new UserIdentPanel("userIdent", UserIdent.of(UserFacade.of(user)), Mode.AVATAR_AND_NAME));
- } else {
- head.add(new Label("title", title).setEscapeModelStrings(false));
- head.add(new WebMarkupContainer("userIdent").setVisible(false));
- }
-
- head.add(AttributeAppender.append("title", getBoard().getIdentifyField()));
- content.add(head);
- if (color != null) {
- head.add(AttributeAppender.append("style", "border-top-color:" + color + ";"));
- content.add(AttributeAppender.append("style", "border-color:" + color + ";"));
- }
-
- if (getQuery() != null) {
- PageParameters params = IssueListPage.paramsOf(getProject(), getQuery().toString(), 1);
- head.add(new BookmarkablePageLink<Void>("viewAsList", IssueListPage.class, params));
- } else {
- head.add(new WebMarkupContainer("viewAsList").setVisible(false));
- }
-
- head.add(new ModalLink("addCard") {
-
- @Override
- protected Component newContent(String id, ModalPanel modal) {
- return new NewCardPanel(id) {
-
- @Override
- protected void onClose(AjaxRequestTarget target) {
- modal.close();
- }
-
- @Override
- protected Project getProject() {
- return BoardColumnPanel.this.getProject();
- }
-
- @Override
- protected IssueCriteria getTemplate() {
- return getQuery().getCriteria();
- }
-
- };
- }
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setVisible(getQuery() != null
- && SecurityUtils.getUser() != null
- && (!getBoard().getIdentifyField().equals(IssueConstants.FIELD_STATE)
- || getColumn().equals(getIssueSetting().getInitialStateSpec().getName())));
- }
-
- });
-
- head.add(new CardCountLabel("count") {
-
- @Override
- protected Project getProject() {
- return BoardColumnPanel.this.getProject();
- }
-
- @Override
- protected int getCount() {
- return countModel.getObject();
- }
-
- });
-
- add(ajaxBehavior = new AbstractPostAjaxBehavior() {
-
- private void markAccepted(AjaxRequestTarget target, Issue issue, boolean accepted) {
- target.appendJavaScript(String.format("onedev.server.issueBoards.markAccepted(%d, %b);",
- issue.getId(), accepted));
- }
-
- @Override
- protected void respond(AjaxRequestTarget target) {
- IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();
- Long issueId = params.getParameterValue("issue").toLong();
- Issue issue = OneDev.getInstance(IssueManager.class).load(issueId);
- String fieldName = getBoard().getIdentifyField();
- if (issue.getMilestone() == null && getMilestone() != null) {
- // move a backlog issue to board
- if (!SecurityUtils.canWriteCode(issue.getProject().getFacade()))
- throw new UnauthorizedException("Permission denied");
-
- OneDev.getInstance(IssueChangeManager.class).changeMilestone(issue, getMilestone(), SecurityUtils.getUser());
- markAccepted(target, issue, true);
- } else if (fieldName.equals(IssueConstants.FIELD_STATE)) {
- IssueSetting workflow = getProject().getIssueSetting();
- AtomicReference<TransitionSpec> transitionRef = new AtomicReference<>(null);
- for (TransitionSpec transition: workflow.getTransitionSpecs(true)) {
- if (transition.canTransite(issue)
- && transition.getTrigger() instanceof PressButtonTrigger
- && ((PressButtonTrigger)transition.getTrigger()).isAuthorized()
- && transition.getToState().equals(getColumn())) {
- transitionRef.set(transition);
- break;
- }
- }
- if (transitionRef.get() == null)
- throw new UnauthorizedException("Permission denied");
-
- boolean hasPromptFields = false;
- PressButtonTrigger trigger = (PressButtonTrigger) transitionRef.get().getTrigger();
- for (String promptField: trigger.getPromptFields()) {
- InputSpec fieldSpec = getIssueSetting().getFieldSpec(promptField);
- if (fieldSpec != null && UserMatcher.fromString(fieldSpec.getCanBeChangedBy()).matches(getProject(), SecurityUtils.getUser())) {
- hasPromptFields = true;
- break;
- }
- }
- if (hasPromptFields) {
- new ModalPanel(target) {
-
- @Override
- protected Component newContent(String id) {
- return new StateTransitionPanel(id) {
-
- @Override
- protected void onSaved(AjaxRequestTarget target) {
- markAccepted(target, getIssue(), true);
- close();
- }
-
- @Override
- protected void onCancelled(AjaxRequestTarget target) {
- markAccepted(target, getIssue(), false);
- close();
- }
-
- @Override
- protected Issue getIssue() {
- return OneDev.getInstance(IssueManager.class).load(issueId);
- }
-
- @Override
- protected TransitionSpec getTransition() {
- return transitionRef.get();
- }
-
- };
- }
-
- };
- } else {
- issue.removeFields(transitionRef.get().getRemoveFields());
- OneDev.getInstance(IssueChangeManager.class).changeState(issue, getColumn(), new HashMap<>(), null, SecurityUtils.getUser());
- markAccepted(target, issue, true);
- }
- } else {
- if (!SecurityUtils.canWriteCode(issue.getProject().getFacade()))
- throw new UnauthorizedException("Permission denied");
-
- InputSpec fieldSpec = getIssueSetting().getFieldSpec(fieldName);
- if (fieldSpec == null)
- throw new OneException("Undefined custom field: " + fieldName);
-
- if (!UserMatcher.fromString(fieldSpec.getCanBeChangedBy()).matches(getProject(), SecurityUtils.getUser()))
- throw new UnauthorizedException("Permission denied");
-
- Map<String, Object> fieldValues = new HashMap<>();
- fieldValues.put(fieldName, getColumn());
- OneDev.getInstance(IssueChangeManager.class).changeFields(issue, fieldValues, SecurityUtils.getUser());
- markAccepted(target, issue, true);
- }
- }
-
- });
-
- setOutputMarkupId(true);
- }
-
- @Override
- public Object getInputValue(String name) {
- return null;
- }
-
- protected abstract Project getProject();
-
- protected abstract BoardSpec getBoard();
-
- @Nullable
- protected abstract Milestone getMilestone();
-
- @Nullable
- protected abstract String getColumn();
-
- @Nullable
- protected abstract IssueQuery getBoardQuery();
-
-}
+package io.onedev.server.web.page.project.issues.boards;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.atomic.AtomicReference;
+
+import javax.annotation.Nullable;
+
+import org.apache.commons.lang3.SerializationUtils;
+import org.apache.shiro.authz.UnauthorizedException;
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.attributes.CallbackParameter;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.event.IEvent;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.request.IRequestParameters;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.unbescape.html.HtmlEscape;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.OneException;
+import io.onedev.server.entitymanager.IssueChangeManager;
+import io.onedev.server.entitymanager.IssueManager;
+import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.entitymanager.UserManager;
+import io.onedev.server.model.Issue;
+import io.onedev.server.model.Milestone;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
+import io.onedev.server.model.support.issue.BoardSpec;
+import io.onedev.server.model.support.issue.IssueSetting;
+import io.onedev.server.model.support.issue.StateSpec;
+import io.onedev.server.model.support.issue.TransitionSpec;
+import io.onedev.server.model.support.issue.transitiontrigger.PressButtonTrigger;
+import io.onedev.server.model.support.setting.GlobalIssueSetting;
+import io.onedev.server.search.entity.issue.ChoiceFieldCriteria;
+import io.onedev.server.search.entity.issue.FieldOperatorCriteria;
+import io.onedev.server.search.entity.issue.IssueCriteria;
+import io.onedev.server.search.entity.issue.IssueQuery;
+import io.onedev.server.search.entity.issue.IssueQueryLexer;
+import io.onedev.server.search.entity.issue.MilestoneCriteria;
+import io.onedev.server.search.entity.issue.StateCriteria;
+import io.onedev.server.util.EditContext;
+import io.onedev.server.util.IssueConstants;
+import io.onedev.server.util.OneContext;
+import io.onedev.server.util.SecurityUtils;
+import io.onedev.server.util.facade.UserFacade;
+import io.onedev.server.util.inputspec.InputSpec;
+import io.onedev.server.util.inputspec.choiceinput.ChoiceInput;
+import io.onedev.server.util.inputspec.choiceinput.choiceprovider.ChoiceProvider;
+import io.onedev.server.util.inputspec.userchoiceinput.UserChoiceInput;
+import io.onedev.server.util.userident.UserIdent;
+import io.onedev.server.util.usermatcher.UserMatcher;
+import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
+import io.onedev.server.web.component.modal.ModalLink;
+import io.onedev.server.web.component.modal.ModalPanel;
+import io.onedev.server.web.component.user.ident.UserIdentPanel;
+import io.onedev.server.web.component.user.ident.UserIdentPanel.Mode;
+import io.onedev.server.web.page.project.issues.list.IssueListPage;
+
+@SuppressWarnings("serial")
+abstract class BoardColumnPanel extends Panel implements EditContext {
+
+ private final IModel<IssueQuery> queryModel = new LoadableDetachableModel<IssueQuery>() {
+
+ @Override
+ protected IssueQuery load() {
+ IssueQuery boardQuery = getBoardQuery();
+ if (boardQuery != null) {
+ List<IssueCriteria> criterias = new ArrayList<>();
+ if (boardQuery.getCriteria() != null)
+ criterias.add(boardQuery.getCriteria());
+ if (getMilestone() != null)
+ criterias.add(new MilestoneCriteria(getMilestone().getName()));
+ String identifyField = getBoard().getIdentifyField();
+ if (identifyField.equals(IssueConstants.FIELD_STATE)) {
+ criterias.add(new StateCriteria(getColumn()));
+ } else if (getColumn() != null) {
+ criterias.add(new ChoiceFieldCriteria(identifyField,
+ getColumn(), -1, IssueQueryLexer.Is, false));
+ } else {
+ criterias.add(new FieldOperatorCriteria(identifyField, IssueQueryLexer.IsEmpty));
+ }
+ return new IssueQuery(IssueCriteria.of(criterias), boardQuery.getSorts());
+ } else {
+ return null;
+ }
+ }
+
+ };
+
+ private final IModel<Integer> countModel = new LoadableDetachableModel<Integer>() {
+
+ @Override
+ protected Integer load() {
+ if (getQuery() != null)
+ return OneDev.getInstance(IssueManager.class).count(getProject(), SecurityUtils.getUser(), getQuery().getCriteria());
+ else
+ return 0;
+ }
+
+ };
+
+ private AbstractPostAjaxBehavior ajaxBehavior;
+
+ public BoardColumnPanel(String id) {
+ super(id);
+ }
+
+ @Override
+ protected void onDetach() {
+ queryModel.detach();
+ countModel.detach();
+ super.onDetach();
+ }
+
+ private IssueQuery getQuery() {
+ return queryModel.getObject();
+ }
+
+ private GlobalIssueSetting getIssueSetting() {
+ return OneDev.getInstance(SettingManager.class).getIssueSetting();
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ WebMarkupContainer content = new WebMarkupContainer("content") {
+
+ @Override
+ protected void onBeforeRender() {
+ addOrReplace(new CardListPanel("body") {
+
+ @Override
+ public void onEvent(IEvent<?> event) {
+ super.onEvent(event);
+ if (event.getPayload() instanceof IssueDragging && getQuery() != null) {
+ IssueDragging issueDragging = (IssueDragging) event.getPayload();
+ Issue issue = issueDragging.getIssue();
+ if (Objects.equals(issue.getMilestone(), getMilestone())) {
+ // move issue between board columns
+ IssueSetting workflow = getProject().getIssueSetting();
+ String identifyField = getBoard().getIdentifyField();
+ if (identifyField.equals(IssueConstants.FIELD_STATE)) {
+ issue = SerializationUtils.clone(issue);
+ for (TransitionSpec transition: workflow.getTransitionSpecs(true)) {
+ if (transition.canTransite(issue)
+ && transition.getTrigger() instanceof PressButtonTrigger
+ && ((PressButtonTrigger)transition.getTrigger()).isAuthorized()
+ && transition.getToState().equals(getColumn())) {
+ issue.setState(getColumn());
+ break;
+ }
+ }
+ } else if (SecurityUtils.canWriteCode(issue.getProject().getFacade())) {
+ InputSpec fieldSpec = getIssueSetting().getFieldSpec(identifyField);
+ UserMatcher userMatcher = UserMatcher.fromString(fieldSpec.getCanBeChangedBy());
+ if (fieldSpec != null && userMatcher.matches(getProject(), SecurityUtils.getUser())) {
+ issue = SerializationUtils.clone(issue);
+ issue.setFieldValue(identifyField, getColumn());
+ }
+ }
+ } else if (SecurityUtils.canWriteCode(issue.getProject().getFacade())) {
+ // move issue between backlog column and board column
+ issue = SerializationUtils.clone(issue);
+ issue.setMilestone(getMilestone());
+ }
+ if (getQuery().matches(issue, SecurityUtils.getUser())) {
+ String script = String.format("$('#%s').addClass('issue-droppable');", getMarkupId());
+ issueDragging.getHandler().appendJavaScript(script);
+ }
+ }
+ event.dontBroadcastDeeper();
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ CharSequence callback = ajaxBehavior.getCallbackFunction(CallbackParameter.explicit("issue"));
+ String script = String.format("onedev.server.issueBoards.onColumnDomReady('%s', %s);",
+ getMarkupId(), getQuery()!=null?callback:"undefined");
+ response.render(OnDomReadyHeaderItem.forScript(script));
+ }
+
+ @Override
+ protected Project getProject() {
+ return BoardColumnPanel.this.getProject();
+ }
+
+ @Override
+ protected IssueQuery getQuery() {
+ return BoardColumnPanel.this.getQuery();
+ }
+
+ @Override
+ protected int getCardCount() {
+ return countModel.getObject();
+ }
+
+ });
+
+ super.onBeforeRender();
+ }
+
+ };
+ add(content);
+
+ String title;
+ String color = null;
+ User user = null;
+ String identifyField = getBoard().getIdentifyField();
+ if (getColumn() != null) {
+ title = HtmlEscape.escapeHtml5(getColumn());
+ if (identifyField.equals(IssueConstants.FIELD_STATE)) {
+ StateSpec stateSpec = getIssueSetting().getStateSpec(getColumn());
+ if (stateSpec != null)
+ color = stateSpec.getColor();
+ } else {
+ InputSpec fieldSpec = getIssueSetting().getFieldSpec(identifyField);
+ if (fieldSpec instanceof ChoiceInput) {
+ ChoiceProvider choiceProvider = ((ChoiceInput)fieldSpec).getChoiceProvider();
+ OneContext.push(new OneContext(this));
+ try {
+ color = choiceProvider.getChoices(true).get(getColumn());
+ } finally {
+ OneContext.pop();
+ }
+ } else if (fieldSpec instanceof UserChoiceInput) {
+ user = OneDev.getInstance(UserManager.class).findByName(getColumn());
+ }
+ }
+ } else {
+ InputSpec fieldSpec = getIssueSetting().getFieldSpec(identifyField);
+ if (fieldSpec != null)
+ title = "<i>" + HtmlEscape.escapeHtml5(fieldSpec.getNameOfEmptyValue()) + "</i>";
+ else
+ title = "<i>No value</i>";
+ }
+
+ WebMarkupContainer head = new WebMarkupContainer("head");
+ if (user != null) {
+ head.add(new WebMarkupContainer("title").setVisible(false));
+ head.add(new UserIdentPanel("userIdent", UserIdent.of(UserFacade.of(user)), Mode.AVATAR_AND_NAME));
+ } else {
+ head.add(new Label("title", title).setEscapeModelStrings(false));
+ head.add(new WebMarkupContainer("userIdent").setVisible(false));
+ }
+
+ head.add(AttributeAppender.append("title", getBoard().getIdentifyField()));
+ content.add(head);
+ if (color != null) {
+ head.add(AttributeAppender.append("style", "border-top-color:" + color + ";"));
+ content.add(AttributeAppender.append("style", "border-color:" + color + ";"));
+ }
+
+ if (getQuery() != null) {
+ PageParameters params = IssueListPage.paramsOf(getProject(), getQuery().toString(), 1);
+ head.add(new BookmarkablePageLink<Void>("viewAsList", IssueListPage.class, params));
+ } else {
+ head.add(new WebMarkupContainer("viewAsList").setVisible(false));
+ }
+
+ head.add(new ModalLink("addCard") {
+
+ @Override
+ protected Component newContent(String id, ModalPanel modal) {
+ return new NewCardPanel(id) {
+
+ @Override
+ protected void onClose(AjaxRequestTarget target) {
+ modal.close();
+ }
+
+ @Override
+ protected Project getProject() {
+ return BoardColumnPanel.this.getProject();
+ }
+
+ @Override
+ protected IssueCriteria getTemplate() {
+ return getQuery().getCriteria();
+ }
+
+ };
+ }
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(getQuery() != null
+ && SecurityUtils.getUser() != null
+ && (!getBoard().getIdentifyField().equals(IssueConstants.FIELD_STATE)
+ || getColumn().equals(getIssueSetting().getInitialStateSpec().getName())));
+ }
+
+ });
+
+ head.add(new CardCountLabel("count") {
+
+ @Override
+ protected Project getProject() {
+ return BoardColumnPanel.this.getProject();
+ }
+
+ @Override
+ protected int getCount() {
+ return countModel.getObject();
+ }
+
+ });
+
+ add(ajaxBehavior = new AbstractPostAjaxBehavior() {
+
+ private void markAccepted(AjaxRequestTarget target, Issue issue, boolean accepted) {
+ target.appendJavaScript(String.format("onedev.server.issueBoards.markAccepted(%d, %b);",
+ issue.getId(), accepted));
+ }
+
+ @Override
+ protected void respond(AjaxRequestTarget target) {
+ IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();
+ Long issueId = params.getParameterValue("issue").toLong();
+ Issue issue = OneDev.getInstance(IssueManager.class).load(issueId);
+ String fieldName = getBoard().getIdentifyField();
+ if (issue.getMilestone() == null && getMilestone() != null) {
+ // move a backlog issue to board
+ if (!SecurityUtils.canWriteCode(issue.getProject().getFacade()))
+ throw new UnauthorizedException("Permission denied");
+
+ OneDev.getInstance(IssueChangeManager.class).changeMilestone(issue, getMilestone(), SecurityUtils.getUser());
+ markAccepted(target, issue, true);
+ } else if (fieldName.equals(IssueConstants.FIELD_STATE)) {
+ IssueSetting workflow = getProject().getIssueSetting();
+ AtomicReference<TransitionSpec> transitionRef = new AtomicReference<>(null);
+ for (TransitionSpec transition: workflow.getTransitionSpecs(true)) {
+ if (transition.canTransite(issue)
+ && transition.getTrigger() instanceof PressButtonTrigger
+ && ((PressButtonTrigger)transition.getTrigger()).isAuthorized()
+ && transition.getToState().equals(getColumn())) {
+ transitionRef.set(transition);
+ break;
+ }
+ }
+ if (transitionRef.get() == null)
+ throw new UnauthorizedException("Permission denied");
+
+ boolean hasPromptFields = false;
+ PressButtonTrigger trigger = (PressButtonTrigger) transitionRef.get().getTrigger();
+ for (String promptField: trigger.getPromptFields()) {
+ InputSpec fieldSpec = getIssueSetting().getFieldSpec(promptField);
+ if (fieldSpec != null && UserMatcher.fromString(fieldSpec.getCanBeChangedBy()).matches(getProject(), SecurityUtils.getUser())) {
+ hasPromptFields = true;
+ break;
+ }
+ }
+ if (hasPromptFields) {
+ new ModalPanel(target) {
+
+ @Override
+ protected Component newContent(String id) {
+ return new StateTransitionPanel(id) {
+
+ @Override
+ protected void onSaved(AjaxRequestTarget target) {
+ markAccepted(target, getIssue(), true);
+ close();
+ }
+
+ @Override
+ protected void onCancelled(AjaxRequestTarget target) {
+ markAccepted(target, getIssue(), false);
+ close();
+ }
+
+ @Override
+ protected Issue getIssue() {
+ return OneDev.getInstance(IssueManager.class).load(issueId);
+ }
+
+ @Override
+ protected TransitionSpec getTransition() {
+ return transitionRef.get();
+ }
+
+ };
+ }
+
+ };
+ } else {
+ issue.removeFields(transitionRef.get().getRemoveFields());
+ OneDev.getInstance(IssueChangeManager.class).changeState(issue, getColumn(), new HashMap<>(), null, SecurityUtils.getUser());
+ markAccepted(target, issue, true);
+ }
+ } else {
+ if (!SecurityUtils.canWriteCode(issue.getProject().getFacade()))
+ throw new UnauthorizedException("Permission denied");
+
+ InputSpec fieldSpec = getIssueSetting().getFieldSpec(fieldName);
+ if (fieldSpec == null)
+ throw new OneException("Undefined custom field: " + fieldName);
+
+ if (!UserMatcher.fromString(fieldSpec.getCanBeChangedBy()).matches(getProject(), SecurityUtils.getUser()))
+ throw new UnauthorizedException("Permission denied");
+
+ Map<String, Object> fieldValues = new HashMap<>();
+ fieldValues.put(fieldName, getColumn());
+ OneDev.getInstance(IssueChangeManager.class).changeFields(issue, fieldValues, SecurityUtils.getUser());
+ markAccepted(target, issue, true);
+ }
+ }
+
+ });
+
+ setOutputMarkupId(true);
+ }
+
+ @Override
+ public Object getInputValue(String name) {
+ return null;
+ }
+
+ protected abstract Project getProject();
+
+ protected abstract BoardSpec getBoard();
+
+ @Nullable
+ protected abstract Milestone getMilestone();
+
+ @Nullable
+ protected abstract String getColumn();
+
+ @Nullable
+ protected abstract IssueQuery getBoardQuery();
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java
index cdadb41f24..32c2d61522 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java
@@ -29,7 +29,7 @@ import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.search.entity.build.BuildQuery;
import io.onedev.server.search.entity.build.FixedIssueCriteria;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.inputspec.InputContext;
import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.java
index a881b56262..7d328443c5 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.java
@@ -21,7 +21,7 @@ import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.support.issue.BoardSpec;
import io.onedev.server.search.entity.issue.IssueQuery;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.behavior.WebSocketObserver;
import io.onedev.server.web.behavior.infinitescroll.InfiniteScrollBehavior;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java
index 3df670efea..781ba4cee4 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java
@@ -44,8 +44,8 @@ import io.onedev.server.model.Milestone;
import io.onedev.server.model.Project;
import io.onedev.server.model.support.issue.BoardSpec;
import io.onedev.server.search.entity.issue.IssueQuery;
-import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.behavior.IssueQueryBehavior;
import io.onedev.server.web.behavior.sortable.SortBehavior;
import io.onedev.server.web.behavior.sortable.SortPosition;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.java
index a77e22ba29..6469872729 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.java
@@ -17,8 +17,8 @@ import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.support.issue.TransitionSpec;
import io.onedev.server.model.support.issue.transitiontrigger.PressButtonTrigger;
-import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.IssueUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.inputspec.InputContext;
import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.web.editable.BeanContext;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java
index 3025c39312..e1a75c7461 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java
@@ -30,7 +30,7 @@ import io.onedev.server.cache.UserInfoManager;
import io.onedev.server.entitymanager.IssueManager;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.Issue;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.inputspec.InputContext;
import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.web.component.issue.commits.IssueCommitsPanel;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/IssueListPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/IssueListPage.java
index 34e2deb3bc..5b3af7a90d 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/IssueListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/IssueListPage.java
@@ -20,7 +20,7 @@ import io.onedev.server.model.support.QuerySetting;
import io.onedev.server.model.support.issue.IssueSetting;
import io.onedev.server.model.support.issue.NamedIssueQuery;
import io.onedev.server.search.entity.issue.IssueQuery;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.component.issue.list.IssueListPanel;
import io.onedev.server.web.component.modal.ModalPanel;
import io.onedev.server.web.page.project.issues.ProjectIssuesPage;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.java
index 49b1889640..ff95293a14 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.java
@@ -17,7 +17,7 @@ import io.onedev.server.entitymanager.MilestoneManager;
import io.onedev.server.model.Milestone;
import io.onedev.server.search.entity.issue.IssueQuery;
import io.onedev.server.search.entity.issue.MilestoneCriteria;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.component.MultilineLabel;
import io.onedev.server.web.component.issue.list.IssueListPanel;
import io.onedev.server.web.component.milestone.MilestoneDueLabel;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneEditPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneEditPage.java
index 0146744f6a..94de2078ab 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneEditPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneEditPage.java
@@ -11,7 +11,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.MilestoneManager;
import io.onedev.server.model.Milestone;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.editable.BeanEditor;
import io.onedev.server.web.editable.PathElement;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.java
index 0a1f52f280..2990679e76 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.java
@@ -33,8 +33,8 @@ import io.onedev.server.model.Milestone;
import io.onedev.server.model.Project;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.persistence.dao.EntityCriteria;
-import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.MilestoneSort;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.component.datatable.HistoryAwareDataTable;
import io.onedev.server.web.component.datatable.LoadableDetachableDataProvider;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/NewMilestonePage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/NewMilestonePage.java
index f1c881b522..e612137fa6 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/NewMilestonePage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/NewMilestonePage.java
@@ -10,7 +10,7 @@ import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.MilestoneManager;
import io.onedev.server.model.Milestone;
import io.onedev.server.model.Project;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.editable.BeanEditor;
import io.onedev.server.web.editable.PathElement;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/WorkflowChangeAlertPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/WorkflowChangeAlertPanel.java
index bce6362946..8a5cc153b0 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/WorkflowChangeAlertPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/WorkflowChangeAlertPanel.java
@@ -10,7 +10,7 @@ import org.apache.wicket.model.Model;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.component.modal.ModalLink;
import io.onedev.server.web.component.modal.ModalPanel;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/InvalidPullRequestPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/InvalidPullRequestPage.java
index 663006e135..d9a5b943e1 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/InvalidPullRequestPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/InvalidPullRequestPage.java
@@ -14,7 +14,7 @@ import com.google.common.base.Preconditions;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.PullRequestManager;
import io.onedev.server.model.PullRequest;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.page.project.ProjectPage;
import io.onedev.server.web.util.ConfirmOnClick;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.java
index 223d504837..6b65d95018 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.java
@@ -52,8 +52,8 @@ import io.onedev.server.model.PullRequestQuerySetting;
import io.onedev.server.model.support.QuerySetting;
import io.onedev.server.model.support.pullrequest.NamedPullRequestQuery;
import io.onedev.server.search.entity.pullrequest.PullRequestQuery;
-import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.behavior.PullRequestQueryBehavior;
import io.onedev.server.web.component.branch.BranchLink;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
index 7835a059d2..a3a47ebed3 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
@@ -60,7 +60,7 @@ import io.onedev.server.search.code.CommitIndexed;
import io.onedev.server.search.commit.CommitQuery;
import io.onedev.server.search.commit.Revision;
import io.onedev.server.search.commit.RevisionCriteria;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.diff.WhitespaceOption;
import io.onedev.server.web.ajaxlistener.DisableGlobalLoadingIndicatorListener;
import io.onedev.server.web.component.branch.BranchLink;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
index 5e970b77eb..cd6754669f 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
@@ -98,8 +98,8 @@ import io.onedev.server.model.support.pullrequest.MergePreview;
import io.onedev.server.model.support.pullrequest.MergeStrategy;
import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.pullrequest.PullRequestQuery;
-import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.facade.UserFacade;
import io.onedev.server.util.userident.UserIdent;
import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestOperation.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestOperation.java
index a5a161d90a..7fed651a60 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestOperation.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestOperation.java
@@ -14,7 +14,7 @@ import io.onedev.server.model.PullRequestReview;
import io.onedev.server.model.User;
import io.onedev.server.model.support.pullrequest.MergePreview;
import io.onedev.server.model.support.pullrequest.ReviewResult;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
public enum PullRequestOperation {
DISCARD {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/DiffAndCommentAwarePanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/DiffAndCommentAwarePanel.java
index 1d64099e33..403a8db7f1 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/DiffAndCommentAwarePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/DiffAndCommentAwarePanel.java
@@ -8,7 +8,7 @@ import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.PullRequestChangeManager;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequestChange;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.diff.DiffSupport;
import io.onedev.server.web.component.diff.plain.PlainDiffPanel;
import io.onedev.server.web.component.markdown.AttachmentSupport;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedPanel.java
index 1a1ba496c9..1b97383ee5 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedPanel.java
@@ -11,8 +11,8 @@ import io.onedev.server.entitymanager.PullRequestCommentManager;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestComment;
-import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.facade.UserFacade;
import io.onedev.server.util.userident.UserIdent;
import io.onedev.server.web.component.markdown.AttachmentSupport;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedPanel.java
index c429141f3a..521b1d631b 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedPanel.java
@@ -10,8 +10,8 @@ import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.PullRequestChangeManager;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
-import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.facade.UserFacade;
import io.onedev.server.util.userident.UserIdent;
import io.onedev.server.web.component.markdown.AttachmentSupport;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/codecomments/PullRequestCodeCommentsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/codecomments/PullRequestCodeCommentsPage.java
index 9b2e81b056..182894bcd4 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/codecomments/PullRequestCodeCommentsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/codecomments/PullRequestCodeCommentsPage.java
@@ -13,7 +13,7 @@ import io.onedev.server.OneDev;
import io.onedev.server.cache.UserInfoManager;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.component.codecomment.CodeCommentListPanel;
import io.onedev.server.web.page.project.pullrequests.detail.PullRequestDetailPage;
import io.onedev.server.web.util.PagingHistorySupport;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/savedquery/SaveQueryPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/savedquery/SaveQueryPanel.java
index 74bf6591d6..0f8ad2ecb7 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/savedquery/SaveQueryPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/savedquery/SaveQueryPanel.java
@@ -8,7 +8,7 @@ import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.request.cycle.RequestCycle;
import io.onedev.server.model.Project;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.editable.BeanEditor;
import io.onedev.server.web.page.project.ProjectPage;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.java
index 38bab86598..8cd115b682 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.java
@@ -36,7 +36,7 @@ import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel
import io.onedev.server.model.Project;
import io.onedev.server.model.support.NamedQuery;
import io.onedev.server.model.support.QuerySetting;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.watch.WatchStatus;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingPage.java
index 2c41cbf99c..e3f4603072 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingPage.java
@@ -7,7 +7,7 @@ import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.component.sidebar.SideBar;
import io.onedev.server.web.component.tabbable.Tab;
import io.onedev.server.web.page.project.ProjectPage;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.java
index f762def9b3..2e72d73cd6 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.java
@@ -46,8 +46,8 @@ import io.onedev.server.entitymanager.UserAuthorizationManager;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.model.User;
import io.onedev.server.model.UserAuthorization;
-import io.onedev.server.security.SecurityUtils;
import io.onedev.server.security.permission.ProjectPrivilege;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.facade.GroupAuthorizationFacade;
import io.onedev.server.util.facade.GroupFacade;
import io.onedev.server.util.facade.MembershipFacade;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.java
index 60db9a4265..72d8241857 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.java
@@ -21,8 +21,8 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import io.onedev.server.OneDev;
import io.onedev.server.cache.CommitInfoManager;
import io.onedev.server.git.Contribution;
-import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.Day;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.userident.UserIdent;
import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
import io.onedev.server.web.component.user.detail.UserDetailPanel;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectStatsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectStatsPage.java
index ffa658e893..83f71e0603 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectStatsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectStatsPage.java
@@ -11,7 +11,7 @@ import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.component.tabbable.PageTab;
import io.onedev.server.web.component.tabbable.PageTabLink;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/stats/TopContributorsResource.java b/server-core/src/main/java/io/onedev/server/web/page/project/stats/TopContributorsResource.java
index c4f74d82ff..a369e3e021 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/stats/TopContributorsResource.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/stats/TopContributorsResource.java
@@ -19,8 +19,8 @@ import io.onedev.server.git.Contribution;
import io.onedev.server.git.Contributor;
import io.onedev.server.model.Project;
import io.onedev.server.persistence.dao.Dao;
-import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.Day;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.userident.UserIdent;
import io.onedev.server.web.avatar.AvatarManager;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java
index 438f1b0beb..30bc80f659 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java
@@ -1,440 +1,440 @@
-package io.onedev.server.web.page.project.tags;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.annotation.Nullable;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.ajax.markup.html.form.AjaxButton;
-import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.feedback.FencedFeedbackPanel;
-import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.form.TextArea;
-import org.apache.wicket.markup.html.form.TextField;
-import org.apache.wicket.markup.html.link.AbstractLink;
-import org.apache.wicket.markup.html.list.ListItem;
-import org.apache.wicket.markup.html.list.PageableListView;
-import org.apache.wicket.markup.html.panel.Fragment;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.eclipse.jgit.lib.Constants;
-import org.eclipse.jgit.lib.FileMode;
-import org.eclipse.jgit.lib.ObjectId;
-import org.eclipse.jgit.lib.Repository;
-import org.eclipse.jgit.revwalk.RevCommit;
-import org.eclipse.jgit.revwalk.RevTag;
-
-import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
-import io.onedev.commons.utils.HtmlUtils;
-import io.onedev.commons.utils.StringUtils;
-import io.onedev.server.OneDev;
-import io.onedev.server.OneException;
-import io.onedev.server.entitymanager.BuildManager;
-import io.onedev.server.entitymanager.ProjectManager;
-import io.onedev.server.git.BlobIdent;
-import io.onedev.server.git.GitUtils;
-import io.onedev.server.git.RefInfo;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.support.TagProtection;
-import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.util.userident.UserIdent;
-import io.onedev.server.web.ajaxlistener.ConfirmListener;
-import io.onedev.server.web.behavior.OnTypingDoneBehavior;
-import io.onedev.server.web.component.commit.status.CommitStatusPanel;
-import io.onedev.server.web.component.contributorpanel.ContributorPanel;
-import io.onedev.server.web.component.datatable.HistoryAwarePagingNavigator;
-import io.onedev.server.web.component.link.ArchiveMenuLink;
-import io.onedev.server.web.component.link.ViewStateAwarePageLink;
-import io.onedev.server.web.component.modal.ModalLink;
-import io.onedev.server.web.component.modal.ModalPanel;
-import io.onedev.server.web.component.revisionpicker.RevisionPicker;
-import io.onedev.server.web.component.user.ident.UserIdentPanel;
-import io.onedev.server.web.component.user.ident.UserIdentPanel.Mode;
-import io.onedev.server.web.page.project.ProjectPage;
-import io.onedev.server.web.page.project.blob.ProjectBlobPage;
-import io.onedev.server.web.page.project.commits.CommitDetailPage;
-import io.onedev.server.web.util.PagingHistorySupport;
-
-@SuppressWarnings("serial")
-public class ProjectTagsPage extends ProjectPage {
-
- private static final String PARAM_CURRENT_PAGE = "currentPage";
-
- private static final String PARAM_QUERY = "query";
-
- private WebMarkupContainer tagsContainer;
-
- private PageableListView<RefInfo> tagsView;
-
- private final PagingHistorySupport pagingHistorySupport;
-
- private String query;
-
- private final IModel<List<RefInfo>> tagsModel = new LoadableDetachableModel<List<RefInfo>>() {
-
- @Override
- protected List<RefInfo> load() {
- List<RefInfo> refs = getProject().getTags();
- if (query != null) {
- for (Iterator<RefInfo> it = refs.iterator(); it.hasNext();) {
- String tag = GitUtils.ref2tag(it.next().getRef().getName());
- if (!tag.toLowerCase().contains(query.trim().toLowerCase()))
- it.remove();
- }
- }
- return refs;
- }
-
- };
-
- public ProjectTagsPage(PageParameters params) {
- super(params);
-
- query = params.get(PARAM_QUERY).toString();
-
- pagingHistorySupport = new PagingHistorySupport() {
-
- @Override
- public PageParameters newPageParameters(int currentPage) {
- PageParameters params = paramsOf(getProject());
- params.add(PARAM_CURRENT_PAGE, currentPage+1);
- if (query != null)
- params.add(PARAM_QUERY, query);
- return params;
- }
-
- @Override
- public int getCurrentPage() {
- return getPageParameters().get(PARAM_CURRENT_PAGE).toInt(1)-1;
- }
-
- };
-
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- TextField<String> searchField;
- add(searchField = new TextField<String>("searchTags", Model.of(query)));
- searchField.add(new OnTypingDoneBehavior(200) {
-
- @Override
- protected void onTypingDone(AjaxRequestTarget target) {
- query = searchField.getInput();
- if (StringUtils.isBlank(query))
- query = null;
- target.add(tagsContainer);
- newPagingNavigation(target);
- }
-
- });
-
- add(new ModalLink("createTag") {
-
- private String tagName;
-
- private String tagMessage;
-
- private String tagRevision = getProject().getDefaultBranch();
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
-
- setVisible(SecurityUtils.canCreateTag(getProject(), Constants.R_TAGS));
- }
-
- private RevisionPicker newRevisionPicker() {
- return new RevisionPicker("revision", projectModel, tagRevision) {
-
- @Override
- protected void onSelect(AjaxRequestTarget target, String revision) {
- tagRevision = revision;
- RevisionPicker revisionPicker = newRevisionPicker();
- getParent().replace(revisionPicker);
- target.add(revisionPicker);
- }
-
- };
- }
-
- @Override
- protected Component newContent(String id, ModalPanel modal) {
- Fragment fragment = new Fragment(id, "createTagFrag", ProjectTagsPage.this);
- Form<?> form = new Form<Void>("form");
- form.setOutputMarkupId(true);
- form.add(new NotificationPanel("feedback", form));
- tagName = null;
- final TextField<String> nameInput;
- form.add(nameInput = new TextField<String>("name", new IModel<String>() {
-
- @Override
- public void detach() {
- }
-
- @Override
- public String getObject() {
- return tagName;
- }
-
- @Override
- public void setObject(String object) {
- tagName = object;
- }
-
- }));
- nameInput.setOutputMarkupId(true);
-
- tagMessage = null;
- form.add(new TextArea<String>("message", new IModel<String>() {
-
- @Override
- public void detach() {
- }
-
- @Override
- public String getObject() {
- return tagMessage;
- }
-
- @Override
- public void setObject(String object) {
- tagMessage = object;
- }
-
- }));
- form.add(newRevisionPicker());
- form.add(new AjaxButton("create") {
-
- @Override
- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
- super.onSubmit(target, form);
-
- if (tagName == null) {
- form.error("Tag name is required.");
- target.focusComponent(nameInput);
- target.add(form);
- } else if (!Repository.isValidRefName(Constants.R_HEADS + tagName)) {
- form.error("Invalid tag name.");
- target.focusComponent(nameInput);
- target.add(form);
- } else if (getProject().getObjectId(GitUtils.tag2ref(tagName), false) != null) {
- form.error("Tag '" + tagName + "' already exists, please choose a different name.");
- target.focusComponent(nameInput);
- target.add(form);
- } else {
- Project project = getProject();
- TagProtection protection = project.getTagProtection(tagName, getLoginUser());
- if (protection != null && protection.isNoCreation()) {
- form.error("Unable to create protected tag");
- target.focusComponent(nameInput);
- target.add(form);
- } else {
- getProject().createTag(tagName, tagRevision, getLoginUser().asPerson(), tagMessage);
- modal.close();
- target.add(tagsContainer);
- newPagingNavigation(target);
- }
- }
- }
-
- });
- form.add(new AjaxLink<Void>("cancel") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- modal.close();
- }
-
- });
- fragment.add(form);
- return fragment;
- }
-
- });
-
- add(tagsContainer = new WebMarkupContainer("tagsContainer") {
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setVisible(!tagsModel.getObject().isEmpty());
- }
-
- @Override
- protected void onBeforeRender() {
- List<ObjectId> commitIdsToDisplay = new ArrayList<>();
- for (long i=tagsView.getFirstItemOffset(); i<tagsModel.getObject().size(); i++) {
- if (i-tagsView.getFirstItemOffset() >= tagsView.getItemsPerPage())
- break;
- RefInfo ref = tagsModel.getObject().get((int)i);
- commitIdsToDisplay.add(ref.getPeeledObj().copy());
- }
-
- BuildManager buildManager = OneDev.getInstance(BuildManager.class);
- getProject().cacheCommitStatus(buildManager.queryStatus(getProject(), commitIdsToDisplay));
- super.onBeforeRender();
- }
-
- });
-
- tagsContainer.setOutputMarkupPlaceholderTag(true);
-
- tagsContainer.add(new FencedFeedbackPanel("feedback", tagsContainer).setEscapeModelStrings(false));
-
- tagsContainer.add(tagsView = new PageableListView<RefInfo>("tags", tagsModel,
- io.onedev.server.web.WebConstants.PAGE_SIZE) {
-
- @Override
- protected void populateItem(ListItem<RefInfo> item) {
- RefInfo ref = item.getModelObject();
- String tagName = GitUtils.ref2tag(ref.getRef().getName());
-
- BlobIdent blobIdent = new BlobIdent(tagName, null, FileMode.TREE.getBits());
- ProjectBlobPage.State state = new ProjectBlobPage.State(blobIdent);
- AbstractLink link = new ViewStateAwarePageLink<Void>("tagLink",
- ProjectBlobPage.class, ProjectBlobPage.paramsOf(getProject(), state));
- link.add(new Label("name", tagName));
- item.add(link);
-
- item.add(new CommitStatusPanel("buildStatus", getProject(), ref.getPeeledObj().copy()));
-
- if (ref.getObj() instanceof RevTag) {
- RevTag revTag = (RevTag) ref.getObj();
- Fragment fragment = new Fragment("annotated", "annotatedFrag", ProjectTagsPage.this);
- if (revTag.getTaggerIdent() != null) {
- fragment.add(new UserIdentPanel("author", UserIdent.of(revTag.getTaggerIdent()), Mode.NAME));
- } else {
- fragment.add(new WebMarkupContainer("author").setVisible(false));
- }
- Label message = new Label("message", revTag.getFullMessage());
- message.setOutputMarkupId(true);
- fragment.add(message);
- String toggleScript = String.format("$('#%s').toggle();", message.getMarkupId());
- WebMarkupContainer messageToggle = new WebMarkupContainer("messageToggle");
- messageToggle.add(AttributeAppender.append("onclick", toggleScript));
- messageToggle.setVisible(StringUtils.isNotBlank(revTag.getFullMessage()));
- fragment.add(messageToggle);
- item.add(fragment);
- } else {
- item.add(new WebMarkupContainer("annotated").setVisible(false));
- }
-
- RevCommit commit = (RevCommit) ref.getPeeledObj();
- PageParameters params = CommitDetailPage.paramsOf(getProject(), commit.name());
-
- link = new ViewStateAwarePageLink<Void>("messageLink", CommitDetailPage.class, params);
- link.add(new Label("message", commit.getShortMessage()));
- item.add(link);
-
- item.add(new ContributorPanel("contributor", commit.getAuthorIdent(), commit.getCommitterIdent()));
-
- item.add(new ArchiveMenuLink("download", projectModel) {
-
- @Override
- protected String getRevision() {
- return tagName;
- }
-
- });
-
- item.add(new AjaxLink<Void>("delete") {
-
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- attributes.getAjaxCallListeners().add(new ConfirmListener("Do you really want to delete tag " + tagName + "?"));
- }
-
- @Override
- protected void disableLink(ComponentTag tag) {
- super.disableLink(tag);
- tag.append("class", "disabled", " ");
- tag.put("title", "Deletion not allowed due to branch protection rule");
- }
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- try {
- OneDev.getInstance(ProjectManager.class).deleteTag(getProject(), tagName);
- newPagingNavigation(target);
- } catch (OneException e) {
- tagsContainer.error(HtmlUtils.formatAsHtml(e.getMessage()));
- }
- target.add(tagsContainer);
- }
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
-
- Project project = getProject();
- if (SecurityUtils.canWriteCode(project.getFacade())) {
- TagProtection protection = project.getTagProtection(tagName, getLoginUser());
- setEnabled(protection == null || !protection.isNoDeletion());
- } else {
- setVisible(false);
- }
- }
-
- });
- }
-
- });
-
- tagsView.setCurrentPage(pagingHistorySupport.getCurrentPage());
-
- newPagingNavigation(null);
- }
-
- private void newPagingNavigation(@Nullable AjaxRequestTarget target) {
- Component pagingNavigator = new HistoryAwarePagingNavigator("tagsPageNav", tagsView, pagingHistorySupport);
- pagingNavigator.setVisible(tagsView.getPageCount() > 1);
- pagingNavigator.setOutputMarkupPlaceholderTag(true);
-
- Component noTagsContainer = new WebMarkupContainer("noTags");
- noTagsContainer.setVisible(tagsModel.getObject().isEmpty());
- noTagsContainer.setOutputMarkupPlaceholderTag(true);
-
- if (target != null) {
- replace(pagingNavigator);
- replace(noTagsContainer);
- target.add(pagingNavigator);
- target.add(noTagsContainer);
- } else {
- add(pagingNavigator);
- add(noTagsContainer);
- }
- }
-
- @Override
- protected String getRobotsMeta() {
- return "noindex,nofollow";
- }
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new ProjectTagsResourceReference()));
- }
-
- @Override
- protected boolean isPermitted() {
- return SecurityUtils.canReadCode(getProject().getFacade());
- }
-
-}
+package io.onedev.server.web.page.project.tags;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.annotation.Nullable;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.ajax.markup.html.form.AjaxButton;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.feedback.FencedFeedbackPanel;
+import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.form.TextArea;
+import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.markup.html.link.AbstractLink;
+import org.apache.wicket.markup.html.list.ListItem;
+import org.apache.wicket.markup.html.list.PageableListView;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.eclipse.jgit.lib.Constants;
+import org.eclipse.jgit.lib.FileMode;
+import org.eclipse.jgit.lib.ObjectId;
+import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.revwalk.RevCommit;
+import org.eclipse.jgit.revwalk.RevTag;
+
+import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
+import io.onedev.commons.utils.HtmlUtils;
+import io.onedev.commons.utils.StringUtils;
+import io.onedev.server.OneDev;
+import io.onedev.server.OneException;
+import io.onedev.server.entitymanager.BuildManager;
+import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.git.BlobIdent;
+import io.onedev.server.git.GitUtils;
+import io.onedev.server.git.RefInfo;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.support.TagProtection;
+import io.onedev.server.util.SecurityUtils;
+import io.onedev.server.util.userident.UserIdent;
+import io.onedev.server.web.ajaxlistener.ConfirmListener;
+import io.onedev.server.web.behavior.OnTypingDoneBehavior;
+import io.onedev.server.web.component.commit.status.CommitStatusPanel;
+import io.onedev.server.web.component.contributorpanel.ContributorPanel;
+import io.onedev.server.web.component.datatable.HistoryAwarePagingNavigator;
+import io.onedev.server.web.component.link.ArchiveMenuLink;
+import io.onedev.server.web.component.link.ViewStateAwarePageLink;
+import io.onedev.server.web.component.modal.ModalLink;
+import io.onedev.server.web.component.modal.ModalPanel;
+import io.onedev.server.web.component.revisionpicker.RevisionPicker;
+import io.onedev.server.web.component.user.ident.UserIdentPanel;
+import io.onedev.server.web.component.user.ident.UserIdentPanel.Mode;
+import io.onedev.server.web.page.project.ProjectPage;
+import io.onedev.server.web.page.project.blob.ProjectBlobPage;
+import io.onedev.server.web.page.project.commits.CommitDetailPage;
+import io.onedev.server.web.util.PagingHistorySupport;
+
+@SuppressWarnings("serial")
+public class ProjectTagsPage extends ProjectPage {
+
+ private static final String PARAM_CURRENT_PAGE = "currentPage";
+
+ private static final String PARAM_QUERY = "query";
+
+ private WebMarkupContainer tagsContainer;
+
+ private PageableListView<RefInfo> tagsView;
+
+ private final PagingHistorySupport pagingHistorySupport;
+
+ private String query;
+
+ private final IModel<List<RefInfo>> tagsModel = new LoadableDetachableModel<List<RefInfo>>() {
+
+ @Override
+ protected List<RefInfo> load() {
+ List<RefInfo> refs = getProject().getTags();
+ if (query != null) {
+ for (Iterator<RefInfo> it = refs.iterator(); it.hasNext();) {
+ String tag = GitUtils.ref2tag(it.next().getRef().getName());
+ if (!tag.toLowerCase().contains(query.trim().toLowerCase()))
+ it.remove();
+ }
+ }
+ return refs;
+ }
+
+ };
+
+ public ProjectTagsPage(PageParameters params) {
+ super(params);
+
+ query = params.get(PARAM_QUERY).toString();
+
+ pagingHistorySupport = new PagingHistorySupport() {
+
+ @Override
+ public PageParameters newPageParameters(int currentPage) {
+ PageParameters params = paramsOf(getProject());
+ params.add(PARAM_CURRENT_PAGE, currentPage+1);
+ if (query != null)
+ params.add(PARAM_QUERY, query);
+ return params;
+ }
+
+ @Override
+ public int getCurrentPage() {
+ return getPageParameters().get(PARAM_CURRENT_PAGE).toInt(1)-1;
+ }
+
+ };
+
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ TextField<String> searchField;
+ add(searchField = new TextField<String>("searchTags", Model.of(query)));
+ searchField.add(new OnTypingDoneBehavior(200) {
+
+ @Override
+ protected void onTypingDone(AjaxRequestTarget target) {
+ query = searchField.getInput();
+ if (StringUtils.isBlank(query))
+ query = null;
+ target.add(tagsContainer);
+ newPagingNavigation(target);
+ }
+
+ });
+
+ add(new ModalLink("createTag") {
+
+ private String tagName;
+
+ private String tagMessage;
+
+ private String tagRevision = getProject().getDefaultBranch();
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+
+ setVisible(SecurityUtils.canCreateTag(getProject(), Constants.R_TAGS));
+ }
+
+ private RevisionPicker newRevisionPicker() {
+ return new RevisionPicker("revision", projectModel, tagRevision) {
+
+ @Override
+ protected void onSelect(AjaxRequestTarget target, String revision) {
+ tagRevision = revision;
+ RevisionPicker revisionPicker = newRevisionPicker();
+ getParent().replace(revisionPicker);
+ target.add(revisionPicker);
+ }
+
+ };
+ }
+
+ @Override
+ protected Component newContent(String id, ModalPanel modal) {
+ Fragment fragment = new Fragment(id, "createTagFrag", ProjectTagsPage.this);
+ Form<?> form = new Form<Void>("form");
+ form.setOutputMarkupId(true);
+ form.add(new NotificationPanel("feedback", form));
+ tagName = null;
+ final TextField<String> nameInput;
+ form.add(nameInput = new TextField<String>("name", new IModel<String>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public String getObject() {
+ return tagName;
+ }
+
+ @Override
+ public void setObject(String object) {
+ tagName = object;
+ }
+
+ }));
+ nameInput.setOutputMarkupId(true);
+
+ tagMessage = null;
+ form.add(new TextArea<String>("message", new IModel<String>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public String getObject() {
+ return tagMessage;
+ }
+
+ @Override
+ public void setObject(String object) {
+ tagMessage = object;
+ }
+
+ }));
+ form.add(newRevisionPicker());
+ form.add(new AjaxButton("create") {
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
+ super.onSubmit(target, form);
+
+ if (tagName == null) {
+ form.error("Tag name is required.");
+ target.focusComponent(nameInput);
+ target.add(form);
+ } else if (!Repository.isValidRefName(Constants.R_HEADS + tagName)) {
+ form.error("Invalid tag name.");
+ target.focusComponent(nameInput);
+ target.add(form);
+ } else if (getProject().getObjectId(GitUtils.tag2ref(tagName), false) != null) {
+ form.error("Tag '" + tagName + "' already exists, please choose a different name.");
+ target.focusComponent(nameInput);
+ target.add(form);
+ } else {
+ Project project = getProject();
+ TagProtection protection = project.getTagProtection(tagName, getLoginUser());
+ if (protection != null && protection.isNoCreation()) {
+ form.error("Unable to create protected tag");
+ target.focusComponent(nameInput);
+ target.add(form);
+ } else {
+ getProject().createTag(tagName, tagRevision, getLoginUser().asPerson(), tagMessage);
+ modal.close();
+ target.add(tagsContainer);
+ newPagingNavigation(target);
+ }
+ }
+ }
+
+ });
+ form.add(new AjaxLink<Void>("cancel") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ modal.close();
+ }
+
+ });
+ fragment.add(form);
+ return fragment;
+ }
+
+ });
+
+ add(tagsContainer = new WebMarkupContainer("tagsContainer") {
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(!tagsModel.getObject().isEmpty());
+ }
+
+ @Override
+ protected void onBeforeRender() {
+ List<ObjectId> commitIdsToDisplay = new ArrayList<>();
+ for (long i=tagsView.getFirstItemOffset(); i<tagsModel.getObject().size(); i++) {
+ if (i-tagsView.getFirstItemOffset() >= tagsView.getItemsPerPage())
+ break;
+ RefInfo ref = tagsModel.getObject().get((int)i);
+ commitIdsToDisplay.add(ref.getPeeledObj().copy());
+ }
+
+ BuildManager buildManager = OneDev.getInstance(BuildManager.class);
+ getProject().cacheCommitStatus(buildManager.queryStatus(getProject(), commitIdsToDisplay));
+ super.onBeforeRender();
+ }
+
+ });
+
+ tagsContainer.setOutputMarkupPlaceholderTag(true);
+
+ tagsContainer.add(new FencedFeedbackPanel("feedback", tagsContainer).setEscapeModelStrings(false));
+
+ tagsContainer.add(tagsView = new PageableListView<RefInfo>("tags", tagsModel,
+ io.onedev.server.web.WebConstants.PAGE_SIZE) {
+
+ @Override
+ protected void populateItem(ListItem<RefInfo> item) {
+ RefInfo ref = item.getModelObject();
+ String tagName = GitUtils.ref2tag(ref.getRef().getName());
+
+ BlobIdent blobIdent = new BlobIdent(tagName, null, FileMode.TREE.getBits());
+ ProjectBlobPage.State state = new ProjectBlobPage.State(blobIdent);
+ AbstractLink link = new ViewStateAwarePageLink<Void>("tagLink",
+ ProjectBlobPage.class, ProjectBlobPage.paramsOf(getProject(), state));
+ link.add(new Label("name", tagName));
+ item.add(link);
+
+ item.add(new CommitStatusPanel("buildStatus", getProject(), ref.getPeeledObj().copy()));
+
+ if (ref.getObj() instanceof RevTag) {
+ RevTag revTag = (RevTag) ref.getObj();
+ Fragment fragment = new Fragment("annotated", "annotatedFrag", ProjectTagsPage.this);
+ if (revTag.getTaggerIdent() != null) {
+ fragment.add(new UserIdentPanel("author", UserIdent.of(revTag.getTaggerIdent()), Mode.NAME));
+ } else {
+ fragment.add(new WebMarkupContainer("author").setVisible(false));
+ }
+ Label message = new Label("message", revTag.getFullMessage());
+ message.setOutputMarkupId(true);
+ fragment.add(message);
+ String toggleScript = String.format("$('#%s').toggle();", message.getMarkupId());
+ WebMarkupContainer messageToggle = new WebMarkupContainer("messageToggle");
+ messageToggle.add(AttributeAppender.append("onclick", toggleScript));
+ messageToggle.setVisible(StringUtils.isNotBlank(revTag.getFullMessage()));
+ fragment.add(messageToggle);
+ item.add(fragment);
+ } else {
+ item.add(new WebMarkupContainer("annotated").setVisible(false));
+ }
+
+ RevCommit commit = (RevCommit) ref.getPeeledObj();
+ PageParameters params = CommitDetailPage.paramsOf(getProject(), commit.name());
+
+ link = new ViewStateAwarePageLink<Void>("messageLink", CommitDetailPage.class, params);
+ link.add(new Label("message", commit.getShortMessage()));
+ item.add(link);
+
+ item.add(new ContributorPanel("contributor", commit.getAuthorIdent(), commit.getCommitterIdent()));
+
+ item.add(new ArchiveMenuLink("download", projectModel) {
+
+ @Override
+ protected String getRevision() {
+ return tagName;
+ }
+
+ });
+
+ item.add(new AjaxLink<Void>("delete") {
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmListener("Do you really want to delete tag " + tagName + "?"));
+ }
+
+ @Override
+ protected void disableLink(ComponentTag tag) {
+ super.disableLink(tag);
+ tag.append("class", "disabled", " ");
+ tag.put("title", "Deletion not allowed due to branch protection rule");
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ try {
+ OneDev.getInstance(ProjectManager.class).deleteTag(getProject(), tagName);
+ newPagingNavigation(target);
+ } catch (OneException e) {
+ tagsContainer.error(HtmlUtils.formatAsHtml(e.getMessage()));
+ }
+ target.add(tagsContainer);
+ }
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+
+ Project project = getProject();
+ if (SecurityUtils.canWriteCode(project.getFacade())) {
+ TagProtection protection = project.getTagProtection(tagName, getLoginUser());
+ setEnabled(protection == null || !protection.isNoDeletion());
+ } else {
+ setVisible(false);
+ }
+ }
+
+ });
+ }
+
+ });
+
+ tagsView.setCurrentPage(pagingHistorySupport.getCurrentPage());
+
+ newPagingNavigation(null);
+ }
+
+ private void newPagingNavigation(@Nullable AjaxRequestTarget target) {
+ Component pagingNavigator = new HistoryAwarePagingNavigator("tagsPageNav", tagsView, pagingHistorySupport);
+ pagingNavigator.setVisible(tagsView.getPageCount() > 1);
+ pagingNavigator.setOutputMarkupPlaceholderTag(true);
+
+ Component noTagsContainer = new WebMarkupContainer("noTags");
+ noTagsContainer.setVisible(tagsModel.getObject().isEmpty());
+ noTagsContainer.setOutputMarkupPlaceholderTag(true);
+
+ if (target != null) {
+ replace(pagingNavigator);
+ replace(noTagsContainer);
+ target.add(pagingNavigator);
+ target.add(noTagsContainer);
+ } else {
+ add(pagingNavigator);
+ add(noTagsContainer);
+ }
+ }
+
+ @Override
+ protected String getRobotsMeta() {
+ return "noindex,nofollow";
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(CssHeaderItem.forReference(new ProjectTagsResourceReference()));
+ }
+
+ @Override
+ protected boolean isPermitted() {
+ return SecurityUtils.canReadCode(getProject().getFacade());
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/security/RegisterPage.java b/server-core/src/main/java/io/onedev/server/web/page/security/RegisterPage.java
index febfa7e1cc..18c2dae61b 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/security/RegisterPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/security/RegisterPage.java
@@ -13,7 +13,7 @@ import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.model.User;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.editable.BeanEditor;
import io.onedev.server.web.editable.PathElement;
diff --git a/server-core/src/main/java/io/onedev/server/web/util/ProjectAttachmentSupport.java b/server-core/src/main/java/io/onedev/server/web/util/ProjectAttachmentSupport.java
index dcac1518e5..d283d12c63 100644
--- a/server-core/src/main/java/io/onedev/server/web/util/ProjectAttachmentSupport.java
+++ b/server-core/src/main/java/io/onedev/server/web/util/ProjectAttachmentSupport.java
@@ -19,8 +19,8 @@ import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.model.Project;
import io.onedev.server.persistence.SessionManager;
-import io.onedev.server.security.SecurityUtils;
import io.onedev.server.storage.AttachmentStorageManager;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.facade.ProjectFacade;
import io.onedev.server.web.component.markdown.AttachmentSupport;
import io.onedev.server.web.download.AttachmentDownloadResource;
diff --git a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java
index f7e15c53e8..26e2d2e162 100644
--- a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java
+++ b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java
@@ -30,8 +30,8 @@ import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
-import io.onedev.server.security.SecurityUtils;
import io.onedev.server.security.permission.ProjectPrivilege;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.facade.ProjectFacade;
import io.onedev.server.util.facade.UserFacade;
import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;
diff --git a/server-plugin/server-plugin-artifact/src/main/java/io/onedev/server/plugin/artifact/ArtifactDownloadResource.java b/server-plugin/server-plugin-artifact/src/main/java/io/onedev/server/plugin/artifact/ArtifactDownloadResource.java
index 0cae4ca372..51393cd98c 100644
--- a/server-plugin/server-plugin-artifact/src/main/java/io/onedev/server/plugin/artifact/ArtifactDownloadResource.java
+++ b/server-plugin/server-plugin-artifact/src/main/java/io/onedev/server/plugin/artifact/ArtifactDownloadResource.java
@@ -30,8 +30,8 @@ import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
-import io.onedev.server.security.SecurityUtils;
import io.onedev.server.storage.StorageManager;
+import io.onedev.server.util.SecurityUtils;
public class ArtifactDownloadResource extends AbstractResource {
diff --git a/server-plugin/server-plugin-artifact/src/main/java/io/onedev/server/plugin/artifact/BuildArtifactsPage.java b/server-plugin/server-plugin-artifact/src/main/java/io/onedev/server/plugin/artifact/BuildArtifactsPage.java
index 0bb54afc0a..aa12eedb8e 100644
--- a/server-plugin/server-plugin-artifact/src/main/java/io/onedev/server/plugin/artifact/BuildArtifactsPage.java
+++ b/server-plugin/server-plugin-artifact/src/main/java/io/onedev/server/plugin/artifact/BuildArtifactsPage.java
@@ -37,9 +37,9 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.OneDev;
import io.onedev.server.model.Build;
-import io.onedev.server.security.SecurityUtils;
import io.onedev.server.storage.StorageManager;
import io.onedev.server.util.DateUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.page.project.builds.detail.BuildDetailPage;
@SuppressWarnings("serial")
diff --git a/server-plugin/server-plugin-htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/HtmlReportDownloadResource.java b/server-plugin/server-plugin-htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/HtmlReportDownloadResource.java
index eb5227e054..2d0cb23eda 100644
--- a/server-plugin/server-plugin-htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/HtmlReportDownloadResource.java
+++ b/server-plugin/server-plugin-htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/HtmlReportDownloadResource.java
@@ -30,8 +30,8 @@ import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
-import io.onedev.server.security.SecurityUtils;
import io.onedev.server.storage.StorageManager;
+import io.onedev.server.util.SecurityUtils;
public class HtmlReportDownloadResource extends AbstractResource {
diff --git a/server-plugin/server-plugin-htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/HtmlReportPage.java b/server-plugin/server-plugin-htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/HtmlReportPage.java
index 2094bf8627..8a3a9eba9f 100644
--- a/server-plugin/server-plugin-htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/HtmlReportPage.java
+++ b/server-plugin/server-plugin-htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/HtmlReportPage.java
@@ -23,7 +23,7 @@ import io.onedev.commons.utils.FileUtils;
import io.onedev.commons.utils.LockUtils;
import io.onedev.server.ci.job.JobOutcome;
import io.onedev.server.model.Build;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.page.project.builds.detail.BuildDetailPage;
import io.onedev.server.web.util.QueryPosition;
diff --git a/server-plugin/server-plugin-kubernetes/pom.xml b/server-plugin/server-plugin-kubernetes/pom.xml
index 4d2fbb08e5..2da7319ae0 100644
--- a/server-plugin/server-plugin-kubernetes/pom.xml
+++ b/server-plugin/server-plugin-kubernetes/pom.xml
@@ -8,13 +8,6 @@
<artifactId>server-plugin</artifactId>
<version>3.0.1</version>
</parent>
- <dependencies>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
- <version>1.62</version>
- </dependency>
- </dependencies>
<properties>
<moduleClass>io.onedev.server.plugin.kubernetes.KubernetesModule</moduleClass>
</properties>
diff --git a/server-plugin/server-plugin-kubernetes/src/main/java/io/onedev/server/plugin/kubernetes/KubernetesExecutor.java b/server-plugin/server-plugin-kubernetes/src/main/java/io/onedev/server/plugin/kubernetes/KubernetesExecutor.java
index c80ccde403..10f9f1670b 100644
--- a/server-plugin/server-plugin-kubernetes/src/main/java/io/onedev/server/plugin/kubernetes/KubernetesExecutor.java
+++ b/server-plugin/server-plugin-kubernetes/src/main/java/io/onedev/server/plugin/kubernetes/KubernetesExecutor.java
@@ -1,20 +1,10 @@
package io.onedev.server.plugin.kubernetes;
import java.io.File;
-import java.io.FileInputStream;
import java.io.IOException;
-import java.io.InputStream;
import java.io.Serializable;
-import java.io.StringWriter;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.cert.Certificate;
-import java.security.cert.CertificateEncodingException;
-import java.security.cert.CertificateException;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Enumeration;
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedHashMap;
@@ -27,8 +17,6 @@ import javax.annotation.Nullable;
import org.apache.commons.codec.Charsets;
import org.apache.commons.codec.binary.Base64;
-import org.bouncycastle.util.io.pem.PemObject;
-import org.bouncycastle.util.io.pem.PemWriter;
import org.hibernate.validator.constraints.NotEmpty;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -58,6 +46,7 @@ import io.onedev.server.model.support.JobExecutor;
import io.onedev.server.model.support.RegistryLogin;
import io.onedev.server.plugin.kubernetes.KubernetesExecutor.TestData;
import io.onedev.server.util.JobLogger;
+import io.onedev.server.util.PKCS12CertExtractor;
import io.onedev.server.util.ServerConfig;
import io.onedev.server.util.inputspec.SecretInput;
import io.onedev.server.web.editable.annotation.Editable;
@@ -437,45 +426,15 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
}
}
- private String getCertContent(Certificate cert) {
- StringWriter stringWriter = new StringWriter();
- try (PemWriter pemWriter = new PemWriter(stringWriter)) {
- pemWriter.writeObject(new PemObject("CERTIFICATE", cert.getEncoded()));
- pemWriter.flush();
- } catch (CertificateEncodingException|IOException e) {
- throw new RuntimeException(e);
- }
- return stringWriter.toString().trim();
- }
-
@Nullable
private String createTrustCertsConfigMap(JobLogger logger) {
Map<String, String> configMapData = new LinkedHashMap<>();
ServerConfig serverConfig = OneDev.getInstance(ServerConfig.class);
File keystoreFile = serverConfig.getKeystoreFile();
if (keystoreFile != null) {
- try (InputStream is = new FileInputStream(keystoreFile)) {
- KeyStore keystore = KeyStore.getInstance("pkcs12");
- keystore.load(is, serverConfig.getKeystorePassword().toCharArray());
- Enumeration<String> aliases = keystore.aliases();
- while (aliases.hasMoreElements()) {
- String alias = aliases.nextElement();
- String siteCertContent = getCertContent(keystore.getCertificate(alias));
- String safeAlias = alias.replaceAll("[^a-zA-Z0-9\\.\\_]", "-");
- configMapData.put("keystore-site-cert-" + safeAlias + ".pem", siteCertContent);
-
- Certificate chain[] = keystore.getCertificateChain(alias);
- if (chain != null) {
- for (int i=0; i<chain.length; i++) {
- String caCertContent = getCertContent(chain[i]);
- if (!caCertContent.equals(siteCertContent))
- configMapData.put("keystore-ca-cert-" + safeAlias + "-" + i + ".pem", caCertContent);
- }
- }
- }
- } catch (IOException|KeyStoreException|NoSuchAlgorithmException|CertificateException e) {
- throw new RuntimeException(e);
- }
+ String password = serverConfig.getKeystorePassword();
+ for (Map.Entry<String, String> entry: new PKCS12CertExtractor(keystoreFile, password).extact().entrySet())
+ configMapData.put(entry.getKey(), entry.getValue());
}
File trustCertsDir = serverConfig.getTrustCertsDir();
if (trustCertsDir != null) {
diff --git a/server-plugin/server-plugin-kubernetes/src/main/java/io/onedev/server/plugin/kubernetes/KubernetesResource.java b/server-plugin/server-plugin-kubernetes/src/main/java/io/onedev/server/plugin/kubernetes/KubernetesResource.java
index e1968a5e88..9091ab079f 100644
--- a/server-plugin/server-plugin-kubernetes/src/main/java/io/onedev/server/plugin/kubernetes/KubernetesResource.java
+++ b/server-plugin/server-plugin-kubernetes/src/main/java/io/onedev/server/plugin/kubernetes/KubernetesResource.java
@@ -7,6 +7,7 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.UUID;
@@ -33,6 +34,7 @@ import io.onedev.k8shelper.CacheInstance;
import io.onedev.server.OneException;
import io.onedev.server.ci.job.JobContext;
import io.onedev.server.ci.job.JobManager;
+import io.onedev.server.ci.job.SubmoduleCredential;
@Path("/k8s")
@Consumes(MediaType.WILDCARD)
@@ -59,6 +61,17 @@ public class KubernetesResource {
Map<String, Object> contextMap = new HashMap<>();
contextMap.put("commands", context.getCommands());
contextMap.put("retrieveSource", context.isRetrieveSource());
+ if (context.isRetrieveSource()) {
+ List<Map<String, String>> list = new ArrayList<>();
+ for (SubmoduleCredential each: context.getSubmoduleCredentials()) {
+ Map<String, String> map = new HashMap<>();
+ map.put("url", each.getUrl());
+ map.put("userName", each.getUserName());
+ map.put("password", each.getPasswordSecret());
+ list.add(map);
+ }
+ contextMap.put("submoduleCredentials", list);
+ }
contextMap.put("projectName", context.getProjectName());
contextMap.put("commitHash", context.getCommitId().name());
contextMap.put("collectFiles.includes", context.getCollectFiles().getIncludes());
diff --git a/server-plugin/server-plugin-serverdocker/src/main/java/io/onedev/server/plugin/serverdocker/ServerDockerExecutor.java b/server-plugin/server-plugin-serverdocker/src/main/java/io/onedev/server/plugin/serverdocker/ServerDockerExecutor.java
index 16a227d0b4..6020660fd7 100644
--- a/server-plugin/server-plugin-serverdocker/src/main/java/io/onedev/server/plugin/serverdocker/ServerDockerExecutor.java
+++ b/server-plugin/server-plugin-serverdocker/src/main/java/io/onedev/server/plugin/serverdocker/ServerDockerExecutor.java
@@ -1,521 +1,628 @@
-package io.onedev.server.plugin.serverdocker;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.Callable;
-import java.util.function.Consumer;
-
-import javax.validation.ConstraintValidatorContext;
-
-import org.apache.commons.codec.Charsets;
-import org.apache.commons.lang3.SystemUtils;
-import org.hibernate.validator.constraints.NotEmpty;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.base.Joiner;
-
-import io.onedev.commons.launcher.bootstrap.Bootstrap;
-import io.onedev.commons.utils.FileUtils;
-import io.onedev.commons.utils.PathUtils;
-import io.onedev.commons.utils.StringUtils;
-import io.onedev.commons.utils.command.Commandline;
-import io.onedev.commons.utils.command.LineConsumer;
-import io.onedev.commons.utils.command.ProcessKiller;
-import io.onedev.commons.utils.concurrent.CapacityRunner;
-import io.onedev.k8shelper.CacheInstance;
-import io.onedev.k8shelper.KubernetesHelper;
-import io.onedev.server.OneDev;
-import io.onedev.server.ci.job.JobContext;
-import io.onedev.server.ci.job.JobManager;
-import io.onedev.server.model.support.JobExecutor;
-import io.onedev.server.model.support.RegistryLogin;
-import io.onedev.server.plugin.serverdocker.ServerDockerExecutor.TestData;
-import io.onedev.server.util.JobLogger;
-import io.onedev.server.util.OneContext;
-import io.onedev.server.util.validation.Validatable;
-import io.onedev.server.util.validation.annotation.ClassValidating;
-import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;
-import io.onedev.server.web.editable.annotation.OmitName;
-import io.onedev.server.web.util.Testable;
-
-@Editable(order=200, description="This executor interpretates job environments as docker images, "
- + "and will execute CI jobs inside docker containers created on OneDev server")
-@ClassValidating
-public class ServerDockerExecutor extends JobExecutor implements Testable<TestData>, Validatable {
-
- private static final long serialVersionUID = 1L;
-
- private static final Logger logger = LoggerFactory.getLogger(ServerDockerExecutor.class);
-
- private String dockerExecutable;
-
- private String runOptions;
-
- private int capacity = Runtime.getRuntime().availableProcessors();
-
- private List<RegistryLogin> registryLogins = new ArrayList<>();
-
- private transient CapacityRunner capacityRunner;
-
- @Editable(order=100, description="Optionally specify docker executable, for instance <i>/usr/local/bin/docker</i>. "
- + "Leave empty to use docker executable in PATH")
- @NameOfEmptyValue("Use default")
- public String getDockerExecutable() {
- return dockerExecutable;
- }
-
- public void setDockerExecutable(String dockerExecutable) {
- this.dockerExecutable = dockerExecutable;
- }
-
- @Editable(order=20100, group="More Settings", description="Optionally specify options to run container. For instance, you may use <tt>-m 2g</tt> "
- + "to limit memory of created container to be 2 giga bytes")
- public String getRunOptions() {
- return runOptions;
- }
-
- public void setRunOptions(String runOptions) {
- this.runOptions = runOptions;
- }
-
- public static boolean isRegistryAuthenticationRequired() {
- return (boolean) OneContext.get().getEditContext().getInputValue("authenticateToRegistry");
- }
-
- @Editable(order=20200, group="More Settings", description="Specify max number of concurrent jobs being executed. Each job execution "
- + "will launch a separate docker container. Defaults to number of processors in the system")
- public int getCapacity() {
- return capacity;
- }
-
- public void setCapacity(int capacity) {
- this.capacity = capacity;
- }
-
- @Editable(order=20300, group="More Settings", description="Specify login information for docker registries if necessary")
- public List<RegistryLogin> getRegistryLogins() {
- return registryLogins;
- }
-
- public void setRegistryLogins(List<RegistryLogin> registryLogins) {
- this.registryLogins = registryLogins;
- }
-
- private Commandline getDocker() {
- if (getDockerExecutable() != null)
- return new Commandline(getDockerExecutable());
- else
- return new Commandline("docker");
- }
-
- @SuppressWarnings("unchecked")
- private String getImageOS(JobLogger logger, String image) {
- logger.log("Checking image OS...");
- Commandline docker = getDocker();
- docker.addArgs("inspect", image);
-
- StringBuilder builder = new StringBuilder();
- docker.execute(new LineConsumer(Charsets.UTF_8.name()) {
-
- @Override
- public void consume(String line) {
- ServerDockerExecutor.logger.trace(line);
- builder.append(line).append("\n");
- }
-
- }, newJobLogger(logger)).checkReturnCode();
-
- Map<String, Object> map;
- try {
- map = (Map<String, Object>) new ObjectMapper()
- .readValue(builder.toString(), List.class).iterator().next();
- return (String) map.get("Os");
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- private synchronized CapacityRunner getCapacityRunner() {
- if (capacityRunner == null)
- capacityRunner = new CapacityRunner(capacity);
- return capacityRunner;
- }
-
- private File getCacheHome() {
- return new File(Bootstrap.getSiteDir(), "job-cache");
- }
-
- @Override
- public void execute(String jobToken, JobContext jobContext) {
- jobContext.getLogger().log("Executing job with server docker executor...");
-
- File hostCIHome = FileUtils.createTempDir("onedev-ci");
- try {
- JobLogger logger = jobContext.getLogger();
-
- getCapacityRunner().call(new Callable<Void>() {
-
- @Override
- public Void call() {
- jobContext.notifyJobRunning();
-
- JobManager jobManager = OneDev.getInstance(JobManager.class);
- File hostCacheHome = getCacheHome();
- FileUtils.createDir(hostCacheHome);
-
- logger.log("Allocating job caches...") ;
- Map<CacheInstance, Date> cacheInstances = KubernetesHelper.getCacheInstances(hostCacheHome);
- Map<CacheInstance, String> cacheAllocations = jobManager.allocateJobCaches(jobToken, new Date(), cacheInstances);
- KubernetesHelper.preprocess(hostCacheHome, cacheAllocations, new Consumer<File>() {
-
- @Override
- public void accept(File directory) {
- cleanDirAsRoot(directory);
- }
-
- });
-
- login(logger);
-
- logger.log("Pulling image...") ;
- Commandline docker = getDocker();
- docker.addArgs("pull", jobContext.getEnvironment());
- docker.execute(newDebugLogger(), newJobLogger(logger)).checkReturnCode();
-
- docker.clearArgs();
- String dockerInstance = UUID.randomUUID().toString();
- docker.addArgs("run", "--rm", "--name", dockerInstance);
- for (Map.Entry<String, String> entry: jobContext.getEnvVars().entrySet())
- docker.addArgs("--env", entry.getKey() + "=" + entry.getValue());
- if (getRunOptions() != null)
- docker.addArgs(StringUtils.parseQuoteTokens(getRunOptions()));
-
- String imageOS = getImageOS(logger, jobContext.getEnvironment());
- logger.log("Detected image OS: " + imageOS);
-
- boolean isWindows = imageOS.equals("windows");
-
- File workspaceCache = null;
- for (Map.Entry<CacheInstance, String> entry: cacheAllocations.entrySet()) {
- if (PathUtils.isCurrent(entry.getValue())) {
- workspaceCache = entry.getKey().getDirectory(hostCacheHome);
- break;
- }
- }
-
- File hostWorkspace;
- if (workspaceCache != null) {
- hostWorkspace = workspaceCache;
- } else {
- hostWorkspace = new File(hostCIHome, "workspace");
- FileUtils.createDir(hostWorkspace);
- }
-
- if (jobContext.isRetrieveSource()) {
- logger.log("Retrieving source code...");
- jobContext.retrieveSource(hostWorkspace);
- }
-
- logger.log("Retrieving job dependencies...");
- try {
- FileUtils.copyDirectory(jobContext.getServerWorkspace(), hostWorkspace);
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
-
- String containerCIHome;
- String containerWorkspace;
- String[] containerCommand;
- if (isWindows) {
- containerCIHome = "C:\\onedev-ci";
- containerWorkspace = "C:\\onedev-ci\\workspace";
- containerCommand = new String[] {"cmd", "/c", "C:\\onedev-ci\\job-commands.bat"};
-
- File scriptFile = new File(hostCIHome, "job-commands.bat");
- try {
- FileUtils.writeLines(scriptFile, jobContext.getCommands(), "\r\n");
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- } else {
- containerCIHome = "/onedev-ci";
- containerWorkspace = "/onedev-ci/workspace";
- containerCommand = new String[] {"sh", "/onedev-ci/job-commands.sh"};
-
- File scriptFile = new File(hostCIHome, "job-commands.sh");
- try {
- FileUtils.writeLines(scriptFile, jobContext.getCommands(), "\n");
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- docker.addArgs("-v", hostCIHome.getAbsolutePath() + ":" + containerCIHome);
- if (workspaceCache != null)
- docker.addArgs("-v", workspaceCache.getAbsolutePath() + ":" + containerWorkspace);
- for (Map.Entry<CacheInstance, String> entry: cacheAllocations.entrySet()) {
- if (!PathUtils.isCurrent(entry.getValue())) {
- String hostCachePath = entry.getKey().getDirectory(hostCacheHome).getAbsolutePath();
- String containerCachePath = PathUtils.resolve(containerWorkspace, entry.getValue());
- docker.addArgs("-v", hostCachePath + ":" + containerCachePath);
- }
- }
- if (SystemUtils.IS_OS_LINUX)
- docker.addArgs("-v", "/var/run/docker.sock:/var/run/docker.sock");
-
- docker.addArgs("-w", containerWorkspace, jobContext.getEnvironment());
- docker.addArgs(containerCommand);
-
- logger.log("Running container to execute job...");
-
- try {
- docker.execute(newJobLogger(logger), newJobLogger(logger), null, new ProcessKiller() {
-
- @Override
- public void kill(Process process) {
- logger.log("Stopping container...");
- Commandline cmd = getDocker();
- cmd.addArgs("stop", dockerInstance);
- cmd.execute(newDebugLogger(), newJobLogger(logger)).checkReturnCode();
- }
-
- }).checkReturnCode();
- } finally {
- logger.log("Sending job outcomes...");
-
- int baseLen = hostWorkspace.getAbsolutePath().length()+1;
- for (File file: jobContext.getCollectFiles().listFiles(hostWorkspace)) {
- try {
- FileUtils.copyFile(file, new File(jobContext.getServerWorkspace(), file.getAbsolutePath().substring(baseLen)));
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
- }
- logger.log("Reporting job caches...");
-
- jobManager.reportJobCaches(jobToken, KubernetesHelper.getCacheInstances(hostCacheHome).keySet());
-
- return null;
- }
-
- });
- } finally {
- cleanDirAsRoot(hostCIHome);
- FileUtils.deleteDir(hostCIHome);
- }
- }
-
- private LineConsumer newJobLogger(JobLogger logger) {
- return new LineConsumer(Charsets.UTF_8.name()) {
-
- @Override
- public void consume(String line) {
- logger.log(line);
- }
-
- };
- }
-
- private LineConsumer newDebugLogger() {
- return new LineConsumer(Charsets.UTF_8.name()) {
-
- @Override
- public void consume(String line) {
- logger.debug(line);
- }
-
- };
- }
-
- private void login(JobLogger logger) {
- for (RegistryLogin login: getRegistryLogins()) {
- if (login.getRegistryUrl() != null)
- logger.log(String.format("Login to docker registry '%s'...", login.getRegistryUrl()));
- else
- logger.log("Login to official docker registry...");
- Commandline cmd = getDocker();
- cmd.addArgs("login", "-u", login.getUserName(), "--password-stdin");
- if (login.getRegistryUrl() != null)
- cmd.addArgs(login.getRegistryUrl());
- ByteArrayInputStream input;
- try {
- input = new ByteArrayInputStream(login.getPassword().getBytes(Charsets.UTF_8.name()));
- } catch (UnsupportedEncodingException e) {
- throw new RuntimeException(e);
- }
- cmd.execute(newDebugLogger(), newJobLogger(logger), input).checkReturnCode();
- }
- }
-
- private boolean hasOptions(String[] arguments, String... options) {
- for (String argument: arguments) {
- for (String option: options) {
- if (option.startsWith("--")) {
- if (argument.startsWith(option + "=") || argument.equals(option))
- return true;
- } else if (option.startsWith("-")) {
- if (argument.startsWith(option))
- return true;
- } else {
- throw new RuntimeException("Invalid option: " + option);
- }
- }
- }
- return false;
- }
-
- @Override
- public boolean isValid(ConstraintValidatorContext context) {
- boolean isValid = true;
- Set<String> registryUrls = new HashSet<>();
- for (RegistryLogin login: getRegistryLogins()) {
- if (!registryUrls.add(login.getRegistryUrl())) {
- isValid = false;
- String message;
- if (login.getRegistryUrl() != null)
- message = "Duplicate login entry for registry '" + login.getRegistryUrl() + "'";
- else
- message = "Duplicate login entry for official registry";
- context.buildConstraintViolationWithTemplate(message)
- .addPropertyNode("registryLogins").addConstraintViolation();
- break;
- }
- }
- if (getRunOptions() != null) {
- String[] arguments = StringUtils.parseQuoteTokens(getRunOptions());
- String invalidOptions[] = new String[] {"-w", "--workdir", "-d", "--detach", "-a", "--attach", "-t", "--tty",
- "-i", "--interactive", "--rm", "--restart", "--name"};
- if (hasOptions(arguments, invalidOptions)) {
- StringBuilder errorMessage = new StringBuilder("Can not use options: "
- + Joiner.on(", ").join(invalidOptions));
- context.buildConstraintViolationWithTemplate(errorMessage.toString())
- .addPropertyNode("runOptions").addConstraintViolation();
- isValid = false;
- }
- }
- if (!isValid)
- context.disableDefaultConstraintViolation();
- return isValid;
- }
-
- @Override
- public void test(TestData testData, JobLogger logger) {
- login(logger);
-
- logger.log("Pulling image...");
-
- Commandline cmd = getDocker();
- cmd.addArgs("pull", testData.getDockerImage());
- cmd.execute(newDebugLogger(), newJobLogger(logger)).checkReturnCode();
-
- boolean windows = getImageOS(logger, testData.getDockerImage()).equals("windows");
-
- logger.log("Running container...");
- File workspaceDir = null;
- File cacheDir = null;
- try {
- workspaceDir = Bootstrap.createTempDir("workspace");
- cacheDir = new File(getCacheHome(), UUID.randomUUID().toString());
- FileUtils.createDir(cacheDir);
-
- cmd.clearArgs();
- cmd.addArgs("run", "--rm");
- if (getRunOptions() != null)
- cmd.addArgs(StringUtils.parseQuoteTokens(getRunOptions()));
- String containerWorkspacePath;
- String containerCachePath;
- if (windows) {
- containerWorkspacePath = "C:\\onedev-ci\\workspace";
- containerCachePath = "C:\\onedev-ci\\cache";
- } else {
- containerWorkspacePath = "/onedev-ci/workspace";
- containerCachePath = "/onedev-ci/cache";
- }
- cmd.addArgs("-v", workspaceDir.getAbsolutePath() + ":" + containerWorkspacePath);
- cmd.addArgs("-v", cacheDir.getAbsolutePath() + ":" + containerCachePath);
-
- cmd.addArgs("-w", containerWorkspacePath);
- cmd.addArgs(testData.getDockerImage());
-
- if (windows)
- cmd.addArgs("cmd", "/c", "echo hello from container");
- else
- cmd.addArgs("sh", "-c", "echo hello from container");
-
- cmd.execute(newJobLogger(logger), newJobLogger(logger)).checkReturnCode();
- } finally {
- if (workspaceDir != null)
- FileUtils.deleteDir(workspaceDir);
- if (cacheDir != null)
- FileUtils.deleteDir(cacheDir);
- }
-
- if (!SystemUtils.IS_OS_WINDOWS) {
- logger.log("Checking busybox...");
- cmd = getDocker();
- cmd.addArgs("run", "--rm", "busybox", "sh", "-c", "echo hello from busybox");
- cmd.execute(newJobLogger(logger), newJobLogger(logger)).checkReturnCode();
- }
- }
-
- public void cleanDirAsRoot(File dir) {
- if (SystemUtils.IS_OS_WINDOWS) {
- FileUtils.cleanDir(dir);
- } else {
- Commandline cmd = getDocker();
- String containerPath = "/dir-to-clean";
- cmd.addArgs("run", "-v", dir.getAbsolutePath() + ":" + containerPath, "--rm",
- "busybox", "sh", "-c", "rm -rf " + containerPath + "/*");
- cmd.execute(new LineConsumer() {
-
- @Override
- public void consume(String line) {
- logger.info(line);
- }
-
- }, new LineConsumer() {
-
- @Override
- public void consume(String line) {
- logger.error(line);
- }
-
- }).checkReturnCode();
- }
- }
-
- @Editable(name="Specify a Docker Image to Test Against")
- public static class TestData implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- private String dockerImage;
-
- @Editable
- @OmitName
- @NotEmpty
- public String getDockerImage() {
- return dockerImage;
- }
-
- public void setDockerImage(String dockerImage) {
- this.dockerImage = dockerImage;
- }
-
- }
-
+package io.onedev.server.plugin.serverdocker;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.Callable;
+import java.util.function.Consumer;
+
+import javax.validation.ConstraintValidatorContext;
+
+import org.apache.commons.codec.Charsets;
+import org.apache.commons.lang3.SystemUtils;
+import org.hibernate.validator.constraints.NotEmpty;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.base.Joiner;
+import com.google.common.base.Splitter;
+
+import io.onedev.commons.launcher.bootstrap.Bootstrap;
+import io.onedev.commons.launcher.loader.AppLoader;
+import io.onedev.commons.utils.FileUtils;
+import io.onedev.commons.utils.Maps;
+import io.onedev.commons.utils.PathUtils;
+import io.onedev.commons.utils.StringUtils;
+import io.onedev.commons.utils.command.Commandline;
+import io.onedev.commons.utils.command.LineConsumer;
+import io.onedev.commons.utils.command.ProcessKiller;
+import io.onedev.commons.utils.concurrent.CapacityRunner;
+import io.onedev.k8shelper.CacheInstance;
+import io.onedev.k8shelper.KubernetesHelper;
+import io.onedev.server.OneDev;
+import io.onedev.server.ci.job.JobContext;
+import io.onedev.server.ci.job.JobManager;
+import io.onedev.server.ci.job.SubmoduleCredential;
+import io.onedev.server.git.config.GitConfig;
+import io.onedev.server.model.support.JobExecutor;
+import io.onedev.server.model.support.RegistryLogin;
+import io.onedev.server.plugin.serverdocker.ServerDockerExecutor.TestData;
+import io.onedev.server.util.JobLogger;
+import io.onedev.server.util.OneContext;
+import io.onedev.server.util.PKCS12CertExtractor;
+import io.onedev.server.util.ServerConfig;
+import io.onedev.server.util.validation.Validatable;
+import io.onedev.server.util.validation.annotation.ClassValidating;
+import io.onedev.server.web.editable.annotation.Editable;
+import io.onedev.server.web.editable.annotation.NameOfEmptyValue;
+import io.onedev.server.web.editable.annotation.OmitName;
+import io.onedev.server.web.util.Testable;
+
+@Editable(order=200, description="This executor interpretates job environments as docker images, "
+ + "and will execute CI jobs inside docker containers created on OneDev server")
+@ClassValidating
+public class ServerDockerExecutor extends JobExecutor implements Testable<TestData>, Validatable {
+
+ private static final long serialVersionUID = 1L;
+
+ private static final Logger logger = LoggerFactory.getLogger(ServerDockerExecutor.class);
+
+ private String dockerExecutable;
+
+ private String runOptions;
+
+ private int capacity = Runtime.getRuntime().availableProcessors();
+
+ private List<RegistryLogin> registryLogins = new ArrayList<>();
+
+ private transient CapacityRunner capacityRunner;
+
+ @Editable(order=100, description="Optionally specify docker executable, for instance <i>/usr/local/bin/docker</i>. "
+ + "Leave empty to use docker executable in PATH")
+ @NameOfEmptyValue("Use default")
+ public String getDockerExecutable() {
+ return dockerExecutable;
+ }
+
+ public void setDockerExecutable(String dockerExecutable) {
+ this.dockerExecutable = dockerExecutable;
+ }
+
+ @Editable(order=20100, group="More Settings", description="Optionally specify options to run container. For instance, you may use <tt>-m 2g</tt> "
+ + "to limit memory of created container to be 2 giga bytes")
+ public String getRunOptions() {
+ return runOptions;
+ }
+
+ public void setRunOptions(String runOptions) {
+ this.runOptions = runOptions;
+ }
+
+ public static boolean isRegistryAuthenticationRequired() {
+ return (boolean) OneContext.get().getEditContext().getInputValue("authenticateToRegistry");
+ }
+
+ @Editable(order=20200, group="More Settings", description="Specify max number of concurrent jobs being executed. Each job execution "
+ + "will launch a separate docker container. Defaults to number of processors in the system")
+ public int getCapacity() {
+ return capacity;
+ }
+
+ public void setCapacity(int capacity) {
+ this.capacity = capacity;
+ }
+
+ @Editable(order=20300, group="More Settings", description="Specify login information for docker registries if necessary")
+ public List<RegistryLogin> getRegistryLogins() {
+ return registryLogins;
+ }
+
+ public void setRegistryLogins(List<RegistryLogin> registryLogins) {
+ this.registryLogins = registryLogins;
+ }
+
+ private Commandline getDocker() {
+ if (getDockerExecutable() != null)
+ return new Commandline(getDockerExecutable());
+ else
+ return new Commandline("docker");
+ }
+
+ @SuppressWarnings("unchecked")
+ private String getImageOS(JobLogger logger, String image) {
+ logger.log("Checking image OS...");
+ Commandline docker = getDocker();
+ docker.addArgs("inspect", image);
+
+ StringBuilder builder = new StringBuilder();
+ docker.execute(new LineConsumer(Charsets.UTF_8.name()) {
+
+ @Override
+ public void consume(String line) {
+ ServerDockerExecutor.logger.trace(line);
+ builder.append(line).append("\n");
+ }
+
+ }, newJobLogger(logger)).checkReturnCode();
+
+ Map<String, Object> map;
+ try {
+ map = (Map<String, Object>) new ObjectMapper()
+ .readValue(builder.toString(), List.class).iterator().next();
+ return (String) map.get("Os");
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ private synchronized CapacityRunner getCapacityRunner() {
+ if (capacityRunner == null)
+ capacityRunner = new CapacityRunner(capacity);
+ return capacityRunner;
+ }
+
+ private File getCacheHome() {
+ return new File(Bootstrap.getSiteDir(), "job-cache");
+ }
+
+ @Override
+ public void execute(String jobToken, JobContext jobContext) {
+ jobContext.getLogger().log("Executing job with server docker executor...");
+
+ File hostCIHome = FileUtils.createTempDir("onedev-ci");
+ try {
+ JobLogger logger = jobContext.getLogger();
+
+ getCapacityRunner().call(new Callable<Void>() {
+
+ @Override
+ public Void call() {
+ jobContext.notifyJobRunning();
+
+ JobManager jobManager = OneDev.getInstance(JobManager.class);
+ File hostCacheHome = getCacheHome();
+ FileUtils.createDir(hostCacheHome);
+
+ logger.log("Allocating job caches...") ;
+ Map<CacheInstance, Date> cacheInstances = KubernetesHelper.getCacheInstances(hostCacheHome);
+ Map<CacheInstance, String> cacheAllocations = jobManager.allocateJobCaches(jobToken, new Date(), cacheInstances);
+ KubernetesHelper.preprocess(hostCacheHome, cacheAllocations, new Consumer<File>() {
+
+ @Override
+ public void accept(File directory) {
+ cleanDirAsRoot(directory);
+ }
+
+ });
+
+ login(logger);
+
+ logger.log("Pulling image...") ;
+ Commandline docker = getDocker();
+ docker.addArgs("pull", jobContext.getEnvironment());
+ docker.execute(newDebugLogger(), newJobLogger(logger)).checkReturnCode();
+
+ docker.clearArgs();
+ String dockerInstance = UUID.randomUUID().toString();
+ docker.addArgs("run", "--rm", "--name", dockerInstance);
+ for (Map.Entry<String, String> entry: jobContext.getEnvVars().entrySet())
+ docker.addArgs("--env", entry.getKey() + "=" + entry.getValue());
+ if (getRunOptions() != null)
+ docker.addArgs(StringUtils.parseQuoteTokens(getRunOptions()));
+
+ String imageOS = getImageOS(logger, jobContext.getEnvironment());
+ logger.log("Detected image OS: " + imageOS);
+
+ boolean isWindows = imageOS.equals("windows");
+
+ File workspaceCache = null;
+ for (Map.Entry<CacheInstance, String> entry: cacheAllocations.entrySet()) {
+ if (PathUtils.isCurrent(entry.getValue())) {
+ workspaceCache = entry.getKey().getDirectory(hostCacheHome);
+ break;
+ }
+ }
+
+ File hostWorkspace;
+ if (workspaceCache != null) {
+ hostWorkspace = workspaceCache;
+ } else {
+ hostWorkspace = new File(hostCIHome, "workspace");
+ FileUtils.createDir(hostWorkspace);
+ }
+
+ if (jobContext.isRetrieveSource()) {
+ logger.log("Retrieving source code...");
+ File tempHome = FileUtils.createTempDir();
+ try {
+ Map<String, String> environments = Maps.newHashMap("HOME", tempHome.getAbsolutePath());
+ Commandline git = new Commandline(AppLoader.getInstance(GitConfig.class).getExecutable());
+ git.environments(environments).workingDir(hostWorkspace);
+ LineConsumer logger = new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ jobContext.getLogger().log(line);
+ }
+
+ };
+
+ git.addArgs("config", "--global", "credential.modalprompt", "false");
+ git.execute(logger, logger).checkReturnCode();
+
+ // clear credential.helper list to remove possible Windows credential manager
+ git.clearArgs();
+ if (SystemUtils.IS_OS_WINDOWS)
+ git.addArgs("config", "--global", "credential.helper", "\"\"");
+ else
+ git.addArgs("config", "--global", "credential.helper", "");
+
+ git.execute(logger, logger).checkReturnCode();
+
+ git.clearArgs();
+ git.addArgs("config", "--global", "--add", "credential.helper", "store");
+ git.execute(logger, logger).checkReturnCode();
+
+ git.clearArgs();
+ git.addArgs("config", "--global", "credential.useHttpPath", "true");
+ git.execute(logger, logger).checkReturnCode();
+
+ List<String> trustCertContent = new ArrayList<>();
+ ServerConfig serverConfig = OneDev.getInstance(ServerConfig.class);
+ File keystoreFile = serverConfig.getKeystoreFile();
+ if (keystoreFile != null) {
+ String password = serverConfig.getKeystorePassword();
+ for (Map.Entry<String, String> entry: new PKCS12CertExtractor(keystoreFile, password).extact().entrySet())
+ trustCertContent.addAll(Splitter.on('\n').trimResults().splitToList(entry.getValue()));
+ }
+ if (serverConfig.getTrustCertsDir() != null) {
+ for (File file: serverConfig.getTrustCertsDir().listFiles()) {
+ if (file.isFile())
+ trustCertContent.addAll(FileUtils.readLines(file));
+ }
+ }
+
+ if (!trustCertContent.isEmpty()) {
+ File trustCertFile = new File(tempHome, "trust-cert.pem");
+ FileUtils.writeLines(trustCertFile, trustCertContent, "\n");
+ git.clearArgs();
+ git.addArgs("config", "--global", "http.sslCAInfo", trustCertFile.getAbsolutePath());
+ git.execute(logger, logger).checkReturnCode();
+ }
+
+ List<String> submoduleCredentials = new ArrayList<>();
+ for (SubmoduleCredential submoduleCredential: jobContext.getSubmoduleCredentials()) {
+ String url = submoduleCredential.getUrl();
+ String userName = URLEncoder.encode(submoduleCredential.getUserName(), Charsets.UTF_8.name());
+ String password = URLEncoder.encode(submoduleCredential.getPasswordSecret(), Charsets.UTF_8.name());
+ if (url.startsWith("http://")) {
+ submoduleCredentials.add("http://" + userName + ":" + password
+ + "@" + url.substring("http://".length()).replace(":", "%3a"));
+ } else {
+ submoduleCredentials.add("https://" + userName + ":" + password
+ + "@" + url.substring("https://".length()).replace(":", "%3a"));
+ }
+ }
+ FileUtils.writeLines(new File(tempHome, ".git-credentials"), submoduleCredentials, "\n");
+
+ if (!new File(hostWorkspace, ".git").exists()) {
+ git.clearArgs();
+ git.addArgs("init", ".");
+ git.execute(logger, logger).checkReturnCode();
+ }
+
+ git.clearArgs();
+ git.addArgs("fetch", jobContext.getProjectGitDir().getAbsolutePath(), "--force", "--quiet",
+ "--depth=1", jobContext.getCommitId().name());
+ git.execute(logger, logger).checkReturnCode();
+
+ git.clearArgs();
+ git.addArgs("checkout", "--quiet", jobContext.getCommitId().name());
+ git.execute(logger, logger).checkReturnCode();
+
+ // deinit submodules in case submodule url is changed
+ git.clearArgs();
+ git.addArgs("submodule", "deinit", "--all", "--force", "--quiet");
+ git.execute(logger, logger).checkReturnCode();
+
+ git.clearArgs();
+ git.addArgs("submodule", "update", "--init", "--recursive", "--force", "--quiet", "--depth=1");
+ git.execute(logger, logger).checkReturnCode();
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ } finally {
+ FileUtils.deleteDir(tempHome);
+ }
+ }
+
+ logger.log("Retrieving job dependencies...");
+ try {
+ FileUtils.copyDirectory(jobContext.getServerWorkspace(), hostWorkspace);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+
+ String containerCIHome;
+ String containerWorkspace;
+ String[] containerCommand;
+ if (isWindows) {
+ containerCIHome = "C:\\onedev-ci";
+ containerWorkspace = "C:\\onedev-ci\\workspace";
+ containerCommand = new String[] {"cmd", "/c", "C:\\onedev-ci\\job-commands.bat"};
+
+ File scriptFile = new File(hostCIHome, "job-commands.bat");
+ try {
+ FileUtils.writeLines(scriptFile, jobContext.getCommands(), "\r\n");
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ } else {
+ containerCIHome = "/onedev-ci";
+ containerWorkspace = "/onedev-ci/workspace";
+ containerCommand = new String[] {"sh", "/onedev-ci/job-commands.sh"};
+
+ File scriptFile = new File(hostCIHome, "job-commands.sh");
+ try {
+ FileUtils.writeLines(scriptFile, jobContext.getCommands(), "\n");
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ docker.addArgs("-v", hostCIHome.getAbsolutePath() + ":" + containerCIHome);
+ if (workspaceCache != null)
+ docker.addArgs("-v", workspaceCache.getAbsolutePath() + ":" + containerWorkspace);
+ for (Map.Entry<CacheInstance, String> entry: cacheAllocations.entrySet()) {
+ if (!PathUtils.isCurrent(entry.getValue())) {
+ String hostCachePath = entry.getKey().getDirectory(hostCacheHome).getAbsolutePath();
+ String containerCachePath = PathUtils.resolve(containerWorkspace, entry.getValue());
+ docker.addArgs("-v", hostCachePath + ":" + containerCachePath);
+ }
+ }
+ if (SystemUtils.IS_OS_LINUX)
+ docker.addArgs("-v", "/var/run/docker.sock:/var/run/docker.sock");
+
+ docker.addArgs("-w", containerWorkspace, jobContext.getEnvironment());
+ docker.addArgs(containerCommand);
+
+ logger.log("Running container to execute job...");
+
+ try {
+ docker.execute(newJobLogger(logger), newJobLogger(logger), null, new ProcessKiller() {
+
+ @Override
+ public void kill(Process process) {
+ logger.log("Stopping container...");
+ Commandline cmd = getDocker();
+ cmd.addArgs("stop", dockerInstance);
+ cmd.execute(newDebugLogger(), newJobLogger(logger)).checkReturnCode();
+ }
+
+ }).checkReturnCode();
+ } finally {
+ logger.log("Sending job outcomes...");
+
+ int baseLen = hostWorkspace.getAbsolutePath().length()+1;
+ for (File file: jobContext.getCollectFiles().listFiles(hostWorkspace)) {
+ try {
+ FileUtils.copyFile(file, new File(jobContext.getServerWorkspace(), file.getAbsolutePath().substring(baseLen)));
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
+ logger.log("Reporting job caches...");
+
+ jobManager.reportJobCaches(jobToken, KubernetesHelper.getCacheInstances(hostCacheHome).keySet());
+
+ return null;
+ }
+
+ });
+ } finally {
+ cleanDirAsRoot(hostCIHome);
+ FileUtils.deleteDir(hostCIHome);
+ }
+ }
+
+ private LineConsumer newJobLogger(JobLogger logger) {
+ return new LineConsumer(Charsets.UTF_8.name()) {
+
+ @Override
+ public void consume(String line) {
+ logger.log(line);
+ }
+
+ };
+ }
+
+ private LineConsumer newDebugLogger() {
+ return new LineConsumer(Charsets.UTF_8.name()) {
+
+ @Override
+ public void consume(String line) {
+ logger.debug(line);
+ }
+
+ };
+ }
+
+ private void login(JobLogger logger) {
+ for (RegistryLogin login: getRegistryLogins()) {
+ if (login.getRegistryUrl() != null)
+ logger.log(String.format("Login to docker registry '%s'...", login.getRegistryUrl()));
+ else
+ logger.log("Login to official docker registry...");
+ Commandline cmd = getDocker();
+ cmd.addArgs("login", "-u", login.getUserName(), "--password-stdin");
+ if (login.getRegistryUrl() != null)
+ cmd.addArgs(login.getRegistryUrl());
+ ByteArrayInputStream input;
+ try {
+ input = new ByteArrayInputStream(login.getPassword().getBytes(Charsets.UTF_8.name()));
+ } catch (UnsupportedEncodingException e) {
+ throw new RuntimeException(e);
+ }
+ cmd.execute(newDebugLogger(), newJobLogger(logger), input).checkReturnCode();
+ }
+ }
+
+ private boolean hasOptions(String[] arguments, String... options) {
+ for (String argument: arguments) {
+ for (String option: options) {
+ if (option.startsWith("--")) {
+ if (argument.startsWith(option + "=") || argument.equals(option))
+ return true;
+ } else if (option.startsWith("-")) {
+ if (argument.startsWith(option))
+ return true;
+ } else {
+ throw new RuntimeException("Invalid option: " + option);
+ }
+ }
+ }
+ return false;
+ }
+
+ @Override
+ public boolean isValid(ConstraintValidatorContext context) {
+ boolean isValid = true;
+ Set<String> registryUrls = new HashSet<>();
+ for (RegistryLogin login: getRegistryLogins()) {
+ if (!registryUrls.add(login.getRegistryUrl())) {
+ isValid = false;
+ String message;
+ if (login.getRegistryUrl() != null)
+ message = "Duplicate login entry for registry '" + login.getRegistryUrl() + "'";
+ else
+ message = "Duplicate login entry for official registry";
+ context.buildConstraintViolationWithTemplate(message)
+ .addPropertyNode("registryLogins").addConstraintViolation();
+ break;
+ }
+ }
+ if (getRunOptions() != null) {
+ String[] arguments = StringUtils.parseQuoteTokens(getRunOptions());
+ String invalidOptions[] = new String[] {"-w", "--workdir", "-d", "--detach", "-a", "--attach", "-t", "--tty",
+ "-i", "--interactive", "--rm", "--restart", "--name"};
+ if (hasOptions(arguments, invalidOptions)) {
+ StringBuilder errorMessage = new StringBuilder("Can not use options: "
+ + Joiner.on(", ").join(invalidOptions));
+ context.buildConstraintViolationWithTemplate(errorMessage.toString())
+ .addPropertyNode("runOptions").addConstraintViolation();
+ isValid = false;
+ }
+ }
+ if (!isValid)
+ context.disableDefaultConstraintViolation();
+ return isValid;
+ }
+
+ @Override
+ public void test(TestData testData, JobLogger logger) {
+ login(logger);
+
+ logger.log("Pulling image...");
+
+ Commandline cmd = getDocker();
+ cmd.addArgs("pull", testData.getDockerImage());
+ cmd.execute(newDebugLogger(), newJobLogger(logger)).checkReturnCode();
+
+ boolean windows = getImageOS(logger, testData.getDockerImage()).equals("windows");
+
+ logger.log("Running container...");
+ File workspaceDir = null;
+ File cacheDir = null;
+ try {
+ workspaceDir = Bootstrap.createTempDir("workspace");
+ cacheDir = new File(getCacheHome(), UUID.randomUUID().toString());
+ FileUtils.createDir(cacheDir);
+
+ cmd.clearArgs();
+ cmd.addArgs("run", "--rm");
+ if (getRunOptions() != null)
+ cmd.addArgs(StringUtils.parseQuoteTokens(getRunOptions()));
+ String containerWorkspacePath;
+ String containerCachePath;
+ if (windows) {
+ containerWorkspacePath = "C:\\onedev-ci\\workspace";
+ containerCachePath = "C:\\onedev-ci\\cache";
+ } else {
+ containerWorkspacePath = "/onedev-ci/workspace";
+ containerCachePath = "/onedev-ci/cache";
+ }
+ cmd.addArgs("-v", workspaceDir.getAbsolutePath() + ":" + containerWorkspacePath);
+ cmd.addArgs("-v", cacheDir.getAbsolutePath() + ":" + containerCachePath);
+
+ cmd.addArgs("-w", containerWorkspacePath);
+ cmd.addArgs(testData.getDockerImage());
+
+ if (windows)
+ cmd.addArgs("cmd", "/c", "echo hello from container");
+ else
+ cmd.addArgs("sh", "-c", "echo hello from container");
+
+ cmd.execute(newJobLogger(logger), newJobLogger(logger)).checkReturnCode();
+ } finally {
+ if (workspaceDir != null)
+ FileUtils.deleteDir(workspaceDir);
+ if (cacheDir != null)
+ FileUtils.deleteDir(cacheDir);
+ }
+
+ if (!SystemUtils.IS_OS_WINDOWS) {
+ logger.log("Checking busybox...");
+ cmd = getDocker();
+ cmd.addArgs("run", "--rm", "busybox", "sh", "-c", "echo hello from busybox");
+ cmd.execute(newJobLogger(logger), newJobLogger(logger)).checkReturnCode();
+ }
+ }
+
+ public void cleanDirAsRoot(File dir) {
+ if (SystemUtils.IS_OS_WINDOWS) {
+ FileUtils.cleanDir(dir);
+ } else {
+ Commandline cmd = getDocker();
+ String containerPath = "/dir-to-clean";
+ cmd.addArgs("run", "-v", dir.getAbsolutePath() + ":" + containerPath, "--rm",
+ "busybox", "sh", "-c", "rm -rf " + containerPath + "/*");
+ cmd.execute(new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ logger.info(line);
+ }
+
+ }, new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ logger.error(line);
+ }
+
+ }).checkReturnCode();
+ }
+ }
+
+ @Editable(name="Specify a Docker Image to Test Against")
+ public static class TestData implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private String dockerImage;
+
+ @Editable
+ @OmitName
+ @NotEmpty
+ public String getDockerImage() {
+ return dockerImage;
+ }
+
+ public void setDockerImage(String dockerImage) {
+ this.dockerImage = dockerImage;
+ }
+
+ }
+
}
\ No newline at end of file
diff --git a/server-product/docker/Dockerfile b/server-product/docker/Dockerfile
index 11d9de1d89..d37776b1a2 100644
--- a/server-product/docker/Dockerfile
+++ b/server-product/docker/Dockerfile
@@ -1,6 +1,6 @@
FROM openjdk:8-jdk
COPY build /app
COPY entrypoint.sh idle.sh /root/bin/
-RUN cd /usr/local/bin && curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.15.0/bin/linux/amd64/kubectl && chmod +x kubectl
+COPY kubectl /usr/local/bin/
EXPOSE 6610
CMD ["/root/bin/entrypoint.sh"]
diff --git a/server-product/docker/build.sh b/server-product/docker/build.sh
index 8682fe3676..b50b68bef6 100755
--- a/server-product/docker/build.sh
+++ b/server-product/docker/build.sh
@@ -1,4 +1,5 @@
#!/bin/sh
+rm -rf build onedev-*
unzip ../target/onedev-*.zip
mv onedev-* build
cp ../target/sandbox/site/lib/mysql* ../target/sandbox/site/lib/postgresql* build/site/lib
diff --git a/server-product/docker/kubectl b/server-product/docker/kubectl
new file mode 100755
index 0000000000..fbdba4a181
Binary files /dev/null and b/server-product/docker/kubectl differ
diff --git a/server-product/k8s/trust-certs/kustomization.yaml b/server-product/k8s/trust-certs/kustomization.yaml
index 376d3a68c2..e63e220439 100644
--- a/server-product/k8s/trust-certs/kustomization.yaml
+++ b/server-product/k8s/trust-certs/kustomization.yaml
@@ -4,6 +4,6 @@ bases:
configMapGenerator:
- name: trust-certs
files:
- - onedev.pem
+ - changeme.pem
patchesStrategicMerge:
- deployments.yaml
diff --git a/server-product/pom.xml b/server-product/pom.xml
index f782d4fa03..88ecc0bbe1 100644
--- a/server-product/pom.xml
+++ b/server-product/pom.xml
@@ -1,72 +1,74 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <artifactId>server-product</artifactId>
- <parent>
- <groupId>io.onedev</groupId>
- <artifactId>server</artifactId>
- <version>3.0.1</version>
- </parent>
- <dependencies>
- <dependency>
- <groupId>io.onedev</groupId>
- <artifactId>server-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>io.onedev</groupId>
- <artifactId>server-plugin-artifact</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>io.onedev</groupId>
- <artifactId>server-plugin-htmlreport</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>io.onedev</groupId>
- <artifactId>server-plugin-maven</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>io.onedev</groupId>
- <artifactId>server-plugin-node</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>io.onedev</groupId>
- <artifactId>server-plugin-laravel</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>io.onedev</groupId>
- <artifactId>server-plugin-rubyonrails</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>io.onedev</groupId>
- <artifactId>server-plugin-django</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>io.onedev</groupId>
- <artifactId>server-plugin-gradle</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>io.onedev</groupId>
- <artifactId>server-plugin-kubernetes</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>io.onedev</groupId>
- <artifactId>server-plugin-serverdocker</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- <properties>
- <executables>bin/*.sh, boot/wrapper-*</executables>
- <moduleClass>io.onedev.server.product.ProductModule</moduleClass>
- </properties>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>server-product</artifactId>
+ <parent>
+ <groupId>io.onedev</groupId>
+ <artifactId>server</artifactId>
+ <version>3.0.1</version>
+ </parent>
+ <dependencies>
+ <dependency>
+ <groupId>io.onedev</groupId>
+ <artifactId>server-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.onedev</groupId>
+ <artifactId>server-plugin-artifact</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.onedev</groupId>
+ <artifactId>server-plugin-htmlreport</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.onedev</groupId>
+ <artifactId>server-plugin-maven</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.onedev</groupId>
+ <artifactId>server-plugin-node</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.onedev</groupId>
+ <artifactId>server-plugin-laravel</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.onedev</groupId>
+ <artifactId>server-plugin-rubyonrails</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.onedev</groupId>
+ <artifactId>server-plugin-django</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.onedev</groupId>
+ <artifactId>server-plugin-gradle</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.onedev</groupId>
+ <artifactId>server-plugin-kubernetes</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.onedev</groupId>
+ <artifactId>server-plugin-serverdocker</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ <properties>
+ <executables>bin/*.sh, boot/wrapper-*</executables>
+ <moduleClass>io.onedev.server.product.ProductModule</moduleClass>
+ </properties>
</project>
\ No newline at end of file