Skip to content

Commit 9581bf1

Browse files
basketmcbasketmc
committed
0.14.0:
- OpenKIM im Modus keine TI getestet - SMTP/POP3 - Protokoll des Gateways getestet
1 parent a2c8644 commit 9581bf1

21 files changed

+189
-127
lines changed

‎CHANGELOG.md

+16
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1919
```
2020
```
2121

22+
## [0.14.0]
23+
24+
### Added
25+
```
26+
- OpenKIM im Modus keine TI getestet
27+
- SMTP/POP3 - Protokoll des Gateways getestet
28+
```
29+
30+
### Changed
31+
```
32+
```
33+
34+
### Fixed
35+
```
36+
```
37+
2238
## [0.13.1]
2339

2440
### Added

‎pom.xml

+21-6
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</parent>
1111
<groupId>net.sberg</groupId>
1212
<artifactId>openkim</artifactId>
13-
<version>0.13.1</version>
13+
<version>0.14.0</version>
1414
<name>openkim</name>
1515
<description>Open KIM Client Modul</description>
1616

@@ -36,10 +36,6 @@
3636
<groupId>org.springframework.boot</groupId>
3737
<artifactId>spring-boot-starter-security</artifactId>
3838
</dependency>
39-
<dependency>
40-
<groupId>org.springframework.boot</groupId>
41-
<artifactId>spring-boot-starter-mail</artifactId>
42-
</dependency>
4339
<dependency>
4440
<groupId>org.springframework.boot</groupId>
4541
<artifactId>spring-boot-starter-test</artifactId>
@@ -73,6 +69,10 @@
7369
<groupId>org.apache.commons</groupId>
7470
<artifactId>commons-text</artifactId>
7571
</exclusion>
72+
<!--exclusion>
73+
<groupId>com.sun.mail</groupId>
74+
<artifactId>javax.mail</artifactId>
75+
</exclusion-->
7676
</exclusions>
7777
</dependency>
7878
<dependency>
@@ -94,6 +94,10 @@
9494
<groupId>org.apache.james</groupId>
9595
<artifactId>james-server-jwt</artifactId>
9696
</exclusion>
97+
<!--exclusion>
98+
<groupId>com.sun.mail</groupId>
99+
<artifactId>javax.mail</artifactId>
100+
</exclusion-->
97101
</exclusions>
98102
</dependency>
99103
<dependency>
@@ -184,8 +188,13 @@
184188
<dependency>
185189
<groupId>com.sun.mail</groupId>
186190
<artifactId>dsn</artifactId>
187-
<!-- update to 2.0.x crashes at the moment -->
188191
<version>1.6.7</version>
192+
<exclusions>
193+
<exclusion>
194+
<groupId>com.sun.mail</groupId>
195+
<artifactId>jakarta.mail</artifactId>
196+
</exclusion>
197+
</exclusions>
189198
</dependency>
190199
<dependency>
191200
<groupId>org.webjars</groupId>
@@ -197,6 +206,12 @@
197206
<artifactId>jaxws-ri</artifactId>
198207
<version>4.0.0</version>
199208
<type>pom</type>
209+
<exclusions>
210+
<exclusion>
211+
<groupId>jakarta.mail</groupId>
212+
<artifactId>jakarta.mail-api</artifactId>
213+
</exclusion>
214+
</exclusions>
200215
</dependency>
201216
<dependency>
202217
<groupId>com.sun.xml.bind</groupId>

‎src/main/java/net/sberg/openkim/fachdienst/FachdienstService.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ private String aRequest(DefaultLogger logger, Konnektor konnektor, String domain
135135

136136
AtomicInteger failedCounter = new AtomicInteger();
137137
DnsRequestOperation dnsRequestOperation = (DnsRequestOperation) pipelineService.getOperation(DnsRequestOperation.BUILTIN_VENDOR+"."+DnsRequestOperation.NAME);
138-
DefaultPipelineOperationContext defaultPipelineOperationContext = new DefaultPipelineOperationContext();
138+
DefaultPipelineOperationContext defaultPipelineOperationContext = new DefaultPipelineOperationContext(logger);
139139
defaultPipelineOperationContext.setEnvironmentValue(DnsRequestOperation.NAME, DnsRequestOperation.ENV_DOMAIN, domain);
140140
defaultPipelineOperationContext.setEnvironmentValue(DnsRequestOperation.NAME, DnsRequestOperation.ENV_RECORD_TYPE, Type.string(Type.A));
141141
dnsRequestOperation.execute(
@@ -174,7 +174,7 @@ private Fachdienst fqdnRequest(DefaultLogger logger, Konnektor konnektor, Fachdi
174174
AtomicInteger failedCounter = new AtomicInteger();
175175

176176
DnsFqdnRequestOperation dnsFqdnRequestOperation = (DnsFqdnRequestOperation) pipelineService.getOperation(DnsFqdnRequestOperation.BUILTIN_VENDOR+"."+DnsFqdnRequestOperation.NAME);
177-
DefaultPipelineOperationContext defaultPipelineOperationContext = new DefaultPipelineOperationContext();
177+
DefaultPipelineOperationContext defaultPipelineOperationContext = new DefaultPipelineOperationContext(logger);
178178
defaultPipelineOperationContext.setEnvironmentValue(DnsFqdnRequestOperation.NAME, DnsFqdnRequestOperation.ENV_DOMAIN, domain);
179179
defaultPipelineOperationContext.setEnvironmentValue(DnsFqdnRequestOperation.NAME, DnsFqdnRequestOperation.ENV_PTR_DOMAIN_SUFFIX, fachdienst.getTyp().getDomainSuffix());
180180
dnsFqdnRequestOperation.execute(

‎src/main/java/net/sberg/openkim/gateway/pop3/cmdhandler/Pop3GatewayAuthCmdHandler.java

+11-7
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ protected Response doAuthTest(POP3Session session, Username username, String pas
359359
try {
360360

361361
Konfiguration konfiguration = ((Pop3GatewaySession) session).getLogger().getDefaultLoggerContext().getKonfiguration();
362-
String mailServerIpAddress = null;
362+
String mailServerHost = null;
363363

364364
//instantiate mailserver domain check
365365
if (konfiguration.getGatewayTIMode().equals(EnumGatewayTIMode.FULLSTACK)) {
@@ -370,7 +370,7 @@ protected Response doAuthTest(POP3Session session, Username username, String pas
370370
DnsResult dnsResult = null;
371371
AtomicInteger failedCounter = new AtomicInteger();
372372
DnsRequestOperation dnsRequestOperation = (DnsRequestOperation) pipelineService.getOperation(DnsRequestOperation.BUILTIN_VENDOR+"."+DnsRequestOperation.NAME);
373-
DefaultPipelineOperationContext defaultPipelineOperationContext = new DefaultPipelineOperationContext();
373+
DefaultPipelineOperationContext defaultPipelineOperationContext = new DefaultPipelineOperationContext(((Pop3GatewaySession) session).getLogger());
374374
defaultPipelineOperationContext.setEnvironmentValue(DnsRequestOperation.NAME, DnsRequestOperation.ENV_DOMAIN, ((Pop3GatewaySession) session).getLogger().getDefaultLoggerContext().getMailServerHost());
375375
defaultPipelineOperationContext.setEnvironmentValue(DnsRequestOperation.NAME, DnsRequestOperation.ENV_RECORD_TYPE, Type.string(Type.A));
376376
dnsRequestOperation.execute(
@@ -394,21 +394,24 @@ protected Response doAuthTest(POP3Session session, Username username, String pas
394394
throw new IllegalStateException("ip-address for domain " + ((Pop3GatewaySession) session).getLogger().getDefaultLoggerContext().getMailServerHost() + " not found");
395395
}
396396

397-
mailServerIpAddress = dnsResult.getAddress();
397+
mailServerHost = dnsResult.getAddress();
398398
} else {
399-
mailServerIpAddress = ((Pop3GatewaySession) session).getLogger().getDefaultLoggerContext().getMailServerHost();
400-
((Pop3GatewaySession) session).log("DO NOT make a dns request. is an ip-address: " + mailServerIpAddress);
399+
mailServerHost = ((Pop3GatewaySession) session).getLogger().getDefaultLoggerContext().getMailServerHost();
400+
((Pop3GatewaySession) session).log("DO NOT make a dns request. is an ip-address: " + mailServerHost);
401401
}
402402
}
403+
else {
404+
mailServerHost = ((Pop3GatewaySession) session).getLogger().getDefaultLoggerContext().getMailServerHost();
405+
}
403406

404-
((Pop3GatewaySession) session).log("connect to " + mailServerIpAddress);
407+
((Pop3GatewaySession) session).log("connect to " + mailServerHost);
405408

406409
Properties props = new Properties();
407410
Session pop3ClientSession = MailUtils.createPop3ClientSession(
408411
props,
409412
EnumMailConnectionSecurity.SSLTLS,
410413
EnumMailAuthMethod.NORMALPWD,
411-
mailServerIpAddress,
414+
mailServerHost,
412415
((Pop3GatewaySession) session).getLogger().getDefaultLoggerContext().getMailServerPort(),
413416
konfiguration.getPop3ClientIdleTimeoutInSeconds(),
414417
konfiguration.getGatewayTIMode().equals(EnumGatewayTIMode.FULLSTACK)?konfiguration.getFachdienstCertFilename():null,
@@ -423,6 +426,7 @@ protected Response doAuthTest(POP3Session session, Username username, String pas
423426
((Pop3GatewaySession) session).setPop3ClientFolder(inbox);
424427
((Pop3GatewaySession) session).setPop3ClientStore(store);
425428

429+
((Pop3GatewaySession) session).getLogger().getDefaultLoggerContext().setMailServerPassword(pass);
426430
((Pop3GatewaySession) session).setGatewayState(EnumPop3GatewayState.PROXY);
427431
session.setHandlerState(POP3Session.TRANSACTION);
428432

‎src/main/java/net/sberg/openkim/gateway/pop3/cmdhandler/Pop3GatewayPassCmdHandler.java

+11-7
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ protected final Response doAuth(POP3Session session, Username user, String pass)
8585
try {
8686

8787
Konfiguration konfiguration = ((Pop3GatewaySession) session).getLogger().getDefaultLoggerContext().getKonfiguration();
88-
String mailServerIpAddress = null;
88+
String mailServerHost = null;
8989

9090
//instantiate mailserver domain check
9191
if (konfiguration.getGatewayTIMode().equals(EnumGatewayTIMode.FULLSTACK)) {
@@ -96,7 +96,7 @@ protected final Response doAuth(POP3Session session, Username user, String pass)
9696
DnsResult dnsResult = null;
9797
AtomicInteger failedCounter = new AtomicInteger();
9898
DnsRequestOperation dnsRequestOperation = (DnsRequestOperation) pipelineService.getOperation(DnsRequestOperation.BUILTIN_VENDOR+"."+DnsRequestOperation.NAME);
99-
DefaultPipelineOperationContext defaultPipelineOperationContext = new DefaultPipelineOperationContext();
99+
DefaultPipelineOperationContext defaultPipelineOperationContext = new DefaultPipelineOperationContext(((Pop3GatewaySession) session).getLogger());
100100
defaultPipelineOperationContext.setEnvironmentValue(DnsRequestOperation.NAME, DnsRequestOperation.ENV_DOMAIN, ((Pop3GatewaySession) session).getLogger().getDefaultLoggerContext().getMailServerHost());
101101
defaultPipelineOperationContext.setEnvironmentValue(DnsRequestOperation.NAME, DnsRequestOperation.ENV_RECORD_TYPE, Type.string(Type.A));
102102
dnsRequestOperation.execute(
@@ -120,21 +120,24 @@ protected final Response doAuth(POP3Session session, Username user, String pass)
120120
throw new IllegalStateException("ip-address for domain " + ((Pop3GatewaySession) session).getLogger().getDefaultLoggerContext().getMailServerHost() + " not found");
121121
}
122122

123-
mailServerIpAddress = dnsResult.getAddress();
123+
mailServerHost = dnsResult.getAddress();
124124
} else {
125-
mailServerIpAddress = ((Pop3GatewaySession) session).getLogger().getDefaultLoggerContext().getMailServerHost();
126-
((Pop3GatewaySession) session).log("DO NOT make a dns request. is an ip-address: " + mailServerIpAddress);
125+
mailServerHost = ((Pop3GatewaySession) session).getLogger().getDefaultLoggerContext().getMailServerHost();
126+
((Pop3GatewaySession) session).log("DO NOT make a dns request. is an ip-address: " + mailServerHost);
127127
}
128128
}
129+
else {
130+
mailServerHost = ((Pop3GatewaySession) session).getLogger().getDefaultLoggerContext().getMailServerHost();
131+
}
129132

130-
((Pop3GatewaySession) session).log("connect to " + mailServerIpAddress);
133+
((Pop3GatewaySession) session).log("connect to " + mailServerHost);
131134

132135
Properties props = new Properties();
133136
Session pop3ClientSession = MailUtils.createPop3ClientSession(
134137
props,
135138
EnumMailConnectionSecurity.SSLTLS,
136139
EnumMailAuthMethod.NORMALPWD,
137-
mailServerIpAddress,
140+
mailServerHost,
138141
((Pop3GatewaySession) session).getLogger().getDefaultLoggerContext().getMailServerPort(),
139142
konfiguration.getPop3ClientIdleTimeoutInSeconds(),
140143
konfiguration.getGatewayTIMode().equals(EnumGatewayTIMode.FULLSTACK)?konfiguration.getFachdienstCertFilename():null,
@@ -149,6 +152,7 @@ protected final Response doAuth(POP3Session session, Username user, String pass)
149152
((Pop3GatewaySession) session).setPop3ClientFolder(inbox);
150153
((Pop3GatewaySession) session).setPop3ClientStore(store);
151154

155+
((Pop3GatewaySession) session).getLogger().getDefaultLoggerContext().setMailServerPassword(pass);
152156
((Pop3GatewaySession) session).setGatewayState(EnumPop3GatewayState.PROXY);
153157
session.setHandlerState(POP3Session.TRANSACTION);
154158

0 commit comments

Comments
 (0)