增加白名单域名，优化开放文档，优化展示

README.md

@@ -26,7 +26,7 @@
 2. 修改zyplayer-doc-manage项目的application.yml配置文件里面的数据库账号密码
 
 3. 启动zyplayer-doc-manage项目，访问地址：
-http://127.0.0.1:8082/zyplayer-doc-manage/statics/manage/home.html
+http://127.0.0.1:8082/zyplayer-doc-manage/static/manage/home.html
 未登录会进入登录页面，登陆后自动跳回，默认账号：zyplayer 密码:123456
 > 项目页面全是静态的html，如果使用idea启动，有可能访问不了静态页面，需要在这里配置下工作目录，然后重新启动即可
 ![](https://images.gitee.com/uploads/images/2019/0127/222951_4ce343fe_596905.png "配置工作目录")

zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/config/MgStorageServiceImpl.java

@@ -1,19 +1,20 @@
 package com.zyplayer.doc.manage.framework.config;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.zyplayer.doc.manage.repository.manage.entity.ZyplayerStorage;
 import com.zyplayer.doc.manage.service.manage.ZyplayerStorageService;
 import com.zyplayer.doc.swagger.framework.service.MgStorage;
 import com.zyplayer.doc.swagger.framework.service.MgStorageService;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 申明为@Service之后网页上才能使用存储能力，同时需要在@EnableSwagger2的地方添加@EnableSwaggerMgUi注解，
@@ -21,14 +22,16 @@ import com.zyplayer.doc.swagger.framework.service.MgStorageService;
  * 开放存储能力的好处：<br/>
  * 所有网页的配置、调试值都可以存储到服务器的数据库中，便于团队所有人的调试，一人配置，所有人受益<br/>
  * 如果不开启的话，数据是存放在浏览器的localStorage中，每个人、每个浏览器都得配置一次才能使用<br/>
- * 
+ *
  * @author 暮光：城中城
  * @since 2018年8月19日
  */
 @Service
 public class MgStorageServiceImpl implements MgStorageService {
-
+	
-	@Autowired
+	@Value("${zyplayer.doc.swagger.proxy-request.white-domain}")
+	private String proxyRequestWhiteDomain;
+	@Resource
 	ZyplayerStorageService zyplayerStorageService;
 
 	/**
@@ -54,10 +57,7 @@ public class MgStorageServiceImpl implements MgStorageService {
 		if (storageList == null || storageList.isEmpty()) {
 			return Collections.emptyList();
 		}
-		List<MgStorage> resultList = storageList.stream().map(val -> {
+		return storageList.stream().map(val -> new MgStorage(val.getDocKey(), val.getDocValue())).collect(Collectors.toList());
-			return new MgStorage(val.getDocKey(), val.getDocValue());
-		}).collect(Collectors.toList());
-		return resultList;
 	}
 
 	/**
@@ -87,5 +87,13 @@ public class MgStorageServiceImpl implements MgStorageService {
 		queryWrapper.eq("doc_key", key);
 		zyplayerStorageService.remove(queryWrapper);
 	}
-
+	
+	@Override
+	public List<String> getProxyRequestWhiteDomain() {
+		if (StringUtils.isBlank(proxyRequestWhiteDomain)) {
+			return Collections.emptyList();
+		}
+		return Arrays.asList(proxyRequestWhiteDomain.split(";"));
+	}
+	
 }

zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/config/security/WebSecurityConfig.java

@@ -39,41 +39,52 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
 	 */
 	@Override
 	public void configure(WebSecurity web) throws Exception {
-		web.ignoring().antMatchers("/static/lib/**", "/css/**", "/js/**", "/img/**");
+		web.ignoring().antMatchers();
 	}
 
 	@Override
 	protected void configure(HttpSecurity http) throws Exception {
 		String loginPage = "/static/manage/login.html";
-		
+		// 无需登录即可访问的接口
+		String[] permitAllAntPatterns = {
+			// 登录接口
+			"/login/**",
+			// 开放接口的静态文件和接口
+			"/open-doc.html", "/webjars/open-doc/**", "/swagger-mg-ui/open-doc/**",
+			// http代理请求接口，有白名单限制，也不怕随便请求到内网资源了
+			"/swagger-mg-ui/http/**",
+			// 静态资源
+			"/webjars/zui/**", "/webjars/vue/**", "/static/lib/**"
+		};
+		// 文档页面需要具有文档权限
+		String[] docAntPatterns = {
+			"/document.html", "/doc-db.html", "/doc.html", "/swagger-ui.html",
+			"/swagger-mg-ui/document/**", "/swagger-mg-ui/storage/**", "/swagger-resources/**"
+		};
 		http.authorizeRequests()
-				.antMatchers(
+			.antMatchers(permitAllAntPatterns).permitAll()
-						"/login/**", "/open-doc.html",
+			.antMatchers(docAntPatterns).hasAuthority("DOC_ALL")
-						"/webjars/open-doc/**", "/swagger-mg-ui/open-doc/**",
+			// 其他地址的访问均需登录
-						"/webjars/zui/**", "/webjars/vue/**"
+			.anyRequest().authenticated().and()
-				).permitAll()//为了测试其他功能，设置“ /** ”允许所有请求
+			// 添加验证码验证
-				.antMatchers("/document.html", "/doc.html").hasAuthority("DOC_ALL")
+			.addFilterAt(myUsernamePasswordAuthenticationFilter(), UsernamePasswordAuthenticationFilter.class)
-				// 其他地址的访问均需登录
+			.exceptionHandling()
-				.anyRequest().authenticated().and()
+			.authenticationEntryPoint(new LoginUrlAuthenticationEntryPoint(loginPage))
-				// 添加验证码验证
+			.and().addFilterAt(rememberMeAuthenticationFilter(), RememberMeAuthenticationFilter.class)
-				.addFilterAt(myUsernamePasswordAuthenticationFilter(), UsernamePasswordAuthenticationFilter.class)
+			// 指定登录页面的请求路径
-				.exceptionHandling()
+			.formLogin().loginPage(loginPage)
-				.authenticationEntryPoint(new LoginUrlAuthenticationEntryPoint(loginPage))
+			// 登陆处理路径
-				.and().addFilterAt(rememberMeAuthenticationFilter(), RememberMeAuthenticationFilter.class)
+			.loginProcessingUrl("/login").permitAll()
-				// 指定登录页面的请求路径
+			// 退出请求的默认路径为logout
-				.formLogin().loginPage(loginPage)
+			.and().logout().deleteCookies("remember-me")
-				// 登陆处理路径
+			.logoutUrl("/logout").logoutSuccessUrl(loginPage)
-				.loginProcessingUrl("/login").permitAll()
+			.permitAll()
-				// 退出请求的默认路径为logout
+			// 开启rememberMe，设置一个私钥专供testall项目使用，注意与下面TokenBasedRememberMeServices的key保持一致
-				.and().logout().deleteCookies("remember-me")
+			// .rememberMe().key("testallKey").and()
-				.logoutUrl("/logout").logoutSuccessUrl(loginPage)
+			// 关闭csrf
-				.permitAll()
+			.and().csrf().disable()
-				// 开启rememberMe，设置一个私钥专供testall项目使用，注意与下面TokenBasedRememberMeServices的key保持一致
+			// X-Frame-Options: SAMEORIGIN 表示该页面可以在相同域名页面的 frame 中展示
-				// .rememberMe().key("testallKey").and()
+			.headers().frameOptions().sameOrigin();
-				// 关闭csrf
-				.and().csrf().disable()
-				// X-Frame-Options: SAMEORIGIN 表示该页面可以在相同域名页面的 frame 中展示
-				.headers().frameOptions().sameOrigin();
 	}
 
 	@Override

zyplayer-doc-manage/src/main/resources/application.yml

@@ -11,6 +11,10 @@ server:
 
 zyplayer:
   doc:
+    swagger:
+      proxy-request:
+        # 内部访问时可以代理请求的域名，使用 ; 分割，必须设置，防止访问到内部地址资源
+        white-domain: http://127.0.0.1/;http://www.baidu.com/;http://swagger-bootstrap-ui.xiaominfo.com/
     # zyplayer_doc_manage管理端的数据库配置
     manage:
       datasource:

zyplayer-doc-swagger/src/main/java/com/zyplayer/doc/swagger/controller/MgDocumentController.java

@@ -15,7 +15,6 @@ import com.zyplayer.doc.swagger.framework.service.MgStorageService;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.aop.support.AopUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -86,38 +85,21 @@ public class MgDocumentController {
 					+ ":" + request.getServerPort() // 端口号
 					+ request.getContextPath();
 			// 是否加入自身的文档
-			Object enableSwaggerMgUi = SpringContextUtil.getBeanWithAnnotation(EnableSwaggerMgUi.class);
+			EnableSwaggerMgUi swaggerMgUi = SpringContextUtil.getEnableSwaggerMgUi();
-			if (enableSwaggerMgUi != null) {
+			if (swaggerMgUi == null) {
-				EnableSwaggerMgUi swaggerMgUi = enableSwaggerMgUi.getClass().getAnnotation(EnableSwaggerMgUi.class);
+				resourcesSet.add(new SwaggerResourcesInfoVo(serverPath + "/swagger-resources"));
-				if (swaggerMgUi == null) {
+			} else {
-					// 直接通过superclass去找
+				if (swaggerMgUi.selfDoc()) {
-					Class<?> superclass = enableSwaggerMgUi.getClass().getSuperclass();
-					if (superclass != null) {
-						swaggerMgUi = superclass.getAnnotation(EnableSwaggerMgUi.class);
-					}
-				}
-				if (swaggerMgUi == null) {
-					// 再通过AopUtils去找
-					Class<?> targetClass = AopUtils.getTargetClass(enableSwaggerMgUi);
-					if (targetClass != null) {
-						swaggerMgUi = targetClass.getAnnotation(EnableSwaggerMgUi.class);
-					}
-				}
-				if (swaggerMgUi == null) {
 					resourcesSet.add(new SwaggerResourcesInfoVo(serverPath + "/swagger-resources"));
-				} else {
+				}
-					if (swaggerMgUi.selfDoc()) {
+				// 启动后第一次访问没有数据情况下需要加载进来的swagger-resources地址
-						resourcesSet.add(new SwaggerResourcesInfoVo(serverPath + "/swagger-resources"));
+				String[] defaultResources = swaggerMgUi.defaultResources();
-					}
+				for (String url : defaultResources) {
-					// 启动后第一次访问没有数据情况下需要加载进来的swagger-resources地址
+					resourcesSet.add(new SwaggerResourcesInfoVo(url));
-					String[] defaultResources = swaggerMgUi.defaultResources();
+				}
-					for (String url : defaultResources) {
+				String[] defaultLocation = swaggerMgUi.defaultLocation();
-						resourcesSet.add(new SwaggerResourcesInfoVo(url));
+				for (String url : defaultLocation) {
-					}
+					locationList.add(new LocationListVo(url, ""));
-					String[] defaultLocation = swaggerMgUi.defaultLocation();
-					for (String url : defaultLocation) {
-						locationList.add(new LocationListVo(url, ""));
-					}
 				}
 			}
 		}

zyplayer-doc-swagger/src/main/java/com/zyplayer/doc/swagger/controller/MgHttpRequestController.java

@@ -7,10 +7,12 @@ import com.zyplayer.doc.swagger.controller.param.HttpRequestParam;
 import com.zyplayer.doc.swagger.controller.vo.HttpCookieVo;
 import com.zyplayer.doc.swagger.controller.vo.HttpHeaderVo;
 import com.zyplayer.doc.swagger.controller.vo.HttpRequestVo;
+import com.zyplayer.doc.swagger.framework.service.MgStorageService;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
 import java.net.HttpCookie;
 import java.util.ArrayList;
 import java.util.List;
@@ -20,7 +22,7 @@ import java.util.stream.Collectors;
 
 /**
  * 后台代理网络请求的控制器
- * 
+ *
  * @author 暮光：城中城
  * @since 2018年8月21日
  */
@@ -28,8 +30,20 @@ import java.util.stream.Collectors;
 @RequestMapping("/swagger-mg-ui/http")
 public class MgHttpRequestController {
 
+	@Resource
+	MgStorageService mgStorageService;
+
 	@PostMapping(value = "/request")
 	public DocResponseJson<HttpRequestVo> post(HttpRequestParam param) {
+		String paramUrl = param.getUrl();
+		List<String> whiteDomain = mgStorageService.getProxyRequestWhiteDomain();
+		if (whiteDomain == null || whiteDomain.isEmpty()) {
+			return DocResponseJson.warn("未设置代理请求白名单，不能代理请求");
+		}
+		long inWhiteList = whiteDomain.stream().filter(paramUrl::startsWith).count();
+		if (inWhiteList <= 0) {
+			return DocResponseJson.warn("该域名不在白名单内，不能代理请求");
+		}
 		HttpRequest request = param.createRequest();
 		HttpResponse response = request.execute();
 		HttpRequestVo httpRequestVo = new HttpRequestVo();

zyplayer-doc-swagger/src/main/java/com/zyplayer/doc/swagger/framework/configuration/SpringContextUtil.java

@@ -1,13 +1,14 @@
 package com.zyplayer.doc.swagger.framework.configuration;
 
-import java.lang.annotation.Annotation;
+import org.springframework.aop.support.AopUtils;
-import java.util.Map;
-
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.stereotype.Component;
 
+import java.lang.annotation.Annotation;
+import java.util.Map;
+
 /**
  * context工具类
  */
@@ -15,6 +16,7 @@ import org.springframework.stereotype.Component;
 public class SpringContextUtil implements ApplicationContextAware {
 	
 	public static ApplicationContext context;
+	private static EnableSwaggerMgUi ENABLE_SWAGGER_MG_UI;
 
 	@Override
 	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
@@ -50,5 +52,38 @@ public class SpringContextUtil implements ApplicationContextAware {
 		}
 		return null;
 	}
+	
+	/**
+	 * 获取EnableSwaggerMgUi
+	 * @date 2019/1/29 12:58
+	**/
+	public static EnableSwaggerMgUi getEnableSwaggerMgUi() {
+		if (ENABLE_SWAGGER_MG_UI != null) {
+			return ENABLE_SWAGGER_MG_UI;
+		}
+		Object annotation = SpringContextUtil.getBeanWithAnnotation(EnableSwaggerMgUi.class);
+		if (annotation != null) {
+			EnableSwaggerMgUi swaggerMgUi = annotation.getClass().getAnnotation(EnableSwaggerMgUi.class);
+			if (swaggerMgUi == null) {
+				// 直接通过superclass去找
+				Class<?> superclass = annotation.getClass().getSuperclass();
+				if (superclass != null) {
+					swaggerMgUi = superclass.getAnnotation(EnableSwaggerMgUi.class);
+				}
+			}
+			if (swaggerMgUi == null) {
+				// 再通过AopUtils去找
+				Class<?> targetClass = AopUtils.getTargetClass(annotation);
+				if (targetClass != null) {
+					swaggerMgUi = targetClass.getAnnotation(EnableSwaggerMgUi.class);
+				}
+			}
+			if (swaggerMgUi != null) {
+				ENABLE_SWAGGER_MG_UI = swaggerMgUi;
+			}
+			return swaggerMgUi;
+		}
+		return null;
+	}
 }
 

zyplayer-doc-swagger/src/main/java/com/zyplayer/doc/swagger/framework/service/MgStorageService.java

@@ -45,4 +45,11 @@ public interface MgStorageService {
 	 */
 	void remove(String key);
 	
-}
+	/**
+	 * 获取代理请求白名单
+	 * @author 暮光：城中城
+	 * @since 2018年8月19日
+	 */
+	List<String> getProxyRequestWhiteDomain();
+	
+}

zyplayer-doc-swagger/src/main/resources/webjars/mg-ui/js/mg-ui-debug.js

@@ -113,6 +113,9 @@ $(document).ready(function(){
 		// debugger;
 		// 模拟请求开始
 		postWithFile("swagger-mg-ui/http/request", formDataToServer, function(result){
+			if (!validateResult(result)) {
+				return;
+			}
 			var afterSendTime = new Date().getTime();
 			//console.log(result);
 			var requestObj = result.data;

zyplayer-doc-swagger/src/main/resources/webjars/open-doc/js/mg-ui-debug.js

@@ -113,6 +113,9 @@ $(document).ready(function(){
 		// debugger;
 		// 模拟请求开始
 		postWithFile("swagger-mg-ui/http/request", formDataToServer, function(result){
+			if (!validateResult(result)) {
+				return;
+			}
 			var afterSendTime = new Date().getTime();
 			//console.log(result);
 			var requestObj = result.data;

zyplayer-doc-swagger/src/main/resources/webjars/zpages/debugDataConfig.html

@@ -58,9 +58,6 @@
 				Toast.success("刷新成功！");
 			},
 			deleteDebugData: function(event){
-				if(!confirm("确定要删除吗？")) {
-					return;
-				}
 				var tr = $(event.currentTarget).parents("tr");
 				var index = tr.data("index");
 				var delKey = app.debugDataList[index].key;

zyplayer-doc-swagger/src/main/resources/webjars/zpages/docUrlConfig.html

@@ -53,7 +53,7 @@
 					<div class="modal-body">
 						<div class="input-line">
 							地址：
-							<input v-model="addNewDocumentInput" type="text" class="form-control" placeholder="例：http://192.168.0.172/swagger-resources">
+							<input v-model="addNewDocumentInput" type="text" class="form-control" placeholder="例：http://127.0.0.1/swagger-resources 或 http://127.0.0.1/v2/api-docs">
 						</div>
 						<div class="input-line">
 							重写域名地址：

zyplayer-doc-swagger/src/main/resources/webjars/zpages/docUrlDetailConfig.html

@@ -9,12 +9,15 @@
 
 <body>
 	<div id="app">
+		<div class="alert alert-primary">
+			<div class="content">Tips：开放文档地址 可以不需要登录即可访问</div>
+		</div>
 		<table class="table table-bordered setting-table">
 			<thead>
 				<tr>
 					<td style="width: 50px;">序号</td>
 					<td>地址</td>
-					<td>唯一文档地址</td>
+					<td>开放文档地址</td>
 					<td>重写域名地址</td>
 					<td>操作</td>
 				</tr>
@@ -34,7 +37,6 @@
 				<tr>
 					<td colspan="5" align="center">
 						<button class="btn" type="button" v-on:click="btnRefreshList">　刷新　</button>
-						<button class="btn btn-info" type="button" v-on:click="exportDocument">导出文档</button>
 						<button class="btn btn-primary" type="button" v-on:click="addNewDocument">增加文档</button>
 					</td>
 				</tr>
@@ -53,7 +55,7 @@
 					<div class="modal-body">
 						<div class="input-line">
 							地址：
-							<input v-model="addNewDocumentInput" type="text" class="form-control" placeholder="例：http://192.168.0.172/swagger-resources 或 http://192.168.0.172/v2/api-docs">
+							<input v-model="addNewDocumentInput" type="text" class="form-control" placeholder="例：http://127.0.0.1/swagger-resources 或 http://127.0.0.1/v2/api-docs">
 						</div>
 						<div class="input-line">
 							重写域名地址：
@@ -134,9 +136,6 @@
 					}
 				});
 			},
-			exportDocument: function () {
-				getExport().exportDocument();
-			},
 			deleteDocUrl: function (event) {
 				if (!confirm("确定要删除吗？")) {
 					return;