Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
7481d734
S
spring-framework
项目概览
爱吃血肠
/
spring-framework
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
spring-framework
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
7481d734
编写于
9月 19, 2018
作者:
R
Rossen Stoyanchev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
WebFlux HandshakeInfo exposes the remoteAddress
Issue: SPR-17192
上级
288a9ecd
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
26 addition
and
5 deletion
+26
-5
spring-webflux/src/main/java/org/springframework/web/reactive/socket/HandshakeInfo.java
...rg/springframework/web/reactive/socket/HandshakeInfo.java
+23
-4
spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/support/HandshakeWebSocketService.java
...tive/socket/server/support/HandshakeWebSocketService.java
+3
-1
未找到文件。
spring-webflux/src/main/java/org/springframework/web/reactive/socket/HandshakeInfo.java
浏览文件 @
7481d734
...
...
@@ -16,6 +16,7 @@
package
org.springframework.web.reactive.socket
;
import
java.net.InetSocketAddress
;
import
java.net.URI
;
import
java.security.Principal
;
import
java.util.Collections
;
...
...
@@ -46,6 +47,9 @@ public class HandshakeInfo {
@Nullable
private
final
String
protocol
;
@Nullable
private
final
InetSocketAddress
remoteAddress
;
private
final
Map
<
String
,
Object
>
attributes
;
@Nullable
...
...
@@ -53,29 +57,33 @@ public class HandshakeInfo {
/**
* Constructor with information about the handshake.
* Constructor with
basic
information about the handshake.
* @param uri the endpoint URL
* @param headers request headers for server or response headers or client
* @param principal the principal for the session
* @param protocol the negotiated sub-protocol (may be {@code null})
*/
public
HandshakeInfo
(
URI
uri
,
HttpHeaders
headers
,
Mono
<
Principal
>
principal
,
@Nullable
String
protocol
)
{
this
(
uri
,
headers
,
principal
,
protocol
,
Collections
.
emptyMap
(),
null
);
this
(
uri
,
headers
,
principal
,
protocol
,
null
,
Collections
.
emptyMap
(),
null
);
}
/**
* Constructor with information about the handshake.
* Constructor targetting server-side use with extra information about the
* handshake, the remote address, and a pre-existing log prefix for
* correlation.
* @param uri the endpoint URL
* @param headers request headers for server or response headers or client
* @param principal the principal for the session
* @param protocol the negotiated sub-protocol (may be {@code null})
* @param remoteAddress the remote address where the handshake came from
* @param attributes initial attributes to use for the WebSocket session
* @param logPrefix log prefix used during the handshake for correlating log
* messages, if any.
* @since 5.1
*/
public
HandshakeInfo
(
URI
uri
,
HttpHeaders
headers
,
Mono
<
Principal
>
principal
,
@Nullable
String
protocol
,
Map
<
String
,
Object
>
attributes
,
@Nullable
String
logPrefix
)
{
@Nullable
String
protocol
,
@Nullable
InetSocketAddress
remoteAddress
,
Map
<
String
,
Object
>
attributes
,
@Nullable
String
logPrefix
)
{
Assert
.
notNull
(
uri
,
"URI is required"
);
Assert
.
notNull
(
headers
,
"HttpHeaders are required"
);
...
...
@@ -86,6 +94,7 @@ public class HandshakeInfo {
this
.
headers
=
headers
;
this
.
principalMono
=
principal
;
this
.
protocol
=
protocol
;
this
.
remoteAddress
=
remoteAddress
;
this
.
attributes
=
attributes
;
this
.
logPrefix
=
logPrefix
;
}
...
...
@@ -123,6 +132,16 @@ public class HandshakeInfo {
return
this
.
protocol
;
}
/**
* For a server-side session this is the remote address where the handshake
* request came from.
* @since 5.1
*/
@Nullable
public
InetSocketAddress
getRemoteAddress
()
{
return
this
.
remoteAddress
;
}
/**
* Attributes extracted from the handshake request to be added to the
* WebSocket session.
...
...
spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/support/HandshakeWebSocketService.java
浏览文件 @
7481d734
...
...
@@ -16,6 +16,7 @@
package
org.springframework.web.reactive.socket.server.support
;
import
java.net.InetSocketAddress
;
import
java.net.URI
;
import
java.security.Principal
;
import
java.util.Collections
;
...
...
@@ -274,7 +275,8 @@ public class HandshakeWebSocketService implements WebSocketService, Lifecycle {
HttpHeaders
headers
=
request
.
getHeaders
();
Mono
<
Principal
>
principal
=
exchange
.
getPrincipal
();
String
logPrefix
=
exchange
.
getLogPrefix
();
return
new
HandshakeInfo
(
uri
,
headers
,
principal
,
protocol
,
attributes
,
logPrefix
);
InetSocketAddress
remoteAddress
=
request
.
getRemoteAddress
();
return
new
HandshakeInfo
(
uri
,
headers
,
principal
,
protocol
,
remoteAddress
,
attributes
,
logPrefix
);
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录