Skip to content

Commit 6348535

Browse files
hutiefang76KomachiSion
authored andcommitted
[ISSUE #14036] Support TLS prefix for HTTP login (#15405)
* Fix HTTP login TLS prefix * style: apply spotless formatting (cherry picked from commit a8d22aa)
1 parent 44cca5f commit 6348535

2 files changed

Lines changed: 30 additions & 1 deletion

File tree

‎client-basic/src/main/java/com/alibaba/nacos/client/auth/impl/process/HttpLoginProcessor.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import com.alibaba.nacos.common.http.client.NacosRestTemplate;
2727
import com.alibaba.nacos.common.http.param.Header;
2828
import com.alibaba.nacos.common.http.param.Query;
29+
import com.alibaba.nacos.common.tls.TlsSystemConfig;
2930
import com.alibaba.nacos.common.utils.InternetAddressUtil;
3031
import com.alibaba.nacos.common.utils.JacksonUtils;
3132
import com.alibaba.nacos.common.utils.StringUtils;
@@ -74,7 +75,7 @@ public LoginIdentityContext getResponse(Properties properties) {
7475
server = server + InternetAddressUtil.IP_PORT_SPLITER
7576
+ ClientBasicParamUtil.getDefaultServerPort();
7677
}
77-
server = HTTP_PREFIX + server;
78+
server = getProtocolPrefix() + server;
7879
}
7980

8081
String url = server + contextPath + LOGIN_V3_URL;
@@ -125,4 +126,8 @@ public LoginIdentityContext getResponse(Properties properties) {
125126
}
126127
}
127128

129+
private static String getProtocolPrefix() {
130+
return Boolean.getBoolean(TlsSystemConfig.TLS_ENABLE) ? HTTPS_PREFIX : HTTP_PREFIX;
131+
}
132+
128133
}

‎client-basic/src/test/java/com/alibaba/nacos/client/auth/impl/process/HttpLoginProcessorTest.java‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import com.alibaba.nacos.common.http.client.NacosRestTemplate;
2424
import com.alibaba.nacos.common.http.param.Header;
2525
import com.alibaba.nacos.common.http.param.Query;
26+
import com.alibaba.nacos.common.tls.TlsSystemConfig;
2627
import com.alibaba.nacos.common.utils.JacksonUtils;
2728
import com.alibaba.nacos.plugin.auth.api.LoginIdentityContext;
2829
import org.junit.jupiter.api.BeforeEach;
@@ -39,7 +40,9 @@
3940
import static org.junit.jupiter.api.Assertions.assertNull;
4041
import static org.mockito.ArgumentMatchers.any;
4142
import static org.mockito.ArgumentMatchers.anyMap;
43+
import static org.mockito.ArgumentMatchers.anyString;
4244
import static org.mockito.ArgumentMatchers.eq;
45+
import static org.mockito.Mockito.verify;
4346
import static org.mockito.Mockito.when;
4447

4548
@ExtendWith(MockitoExtension.class)
@@ -96,6 +99,27 @@ void testGetResponseException() throws Exception {
9699
assertNull(loginProcessor.getResponse(properties));
97100
}
98101

102+
@Test
103+
void testGetResponseUsesHttpsWhenTlsEnabled() throws Exception {
104+
String previousTlsEnable = System.getProperty(TlsSystemConfig.TLS_ENABLE);
105+
System.setProperty(TlsSystemConfig.TLS_ENABLE, "true");
106+
try {
107+
properties.setProperty(NacosAuthLoginConstant.SERVER, "localhost");
108+
when(restTemplate.postForm(anyString(),
109+
eq(Header.EMPTY),
110+
any(Query.class), anyMap(), eq(String.class))).thenReturn(result);
111+
assertNull(loginProcessor.getResponse(properties));
112+
verify(restTemplate).postForm(eq("https://localhost:8848/nacos/v3/auth/user/login"),
113+
eq(Header.EMPTY), any(Query.class), anyMap(), eq(String.class));
114+
} finally {
115+
if (previousTlsEnable == null) {
116+
System.clearProperty(TlsSystemConfig.TLS_ENABLE);
117+
} else {
118+
System.setProperty(TlsSystemConfig.TLS_ENABLE, previousTlsEnable);
119+
}
120+
}
121+
}
122+
99123
@Test
100124
void testGetResponseSuccessFromV1() throws Exception {
101125
properties.setProperty(NacosAuthLoginConstant.SERVER, "localhost");

0 commit comments

Comments
 (0)