Skip to content

Commit 6d1c97a

Browse files
gschambialgschambial
authored
Merge pull request eugenp#1 from eugenp/master
Updating from original
2 parents 52b5c16 + 12e9f05 commit 6d1c97a

149 files changed

Lines changed: 2576 additions & 282 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎cas/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/CasSecuredAppApplication.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@ public ServiceProperties serviceProperties() {
4040
@Primary
4141
public AuthenticationEntryPoint authenticationEntryPoint(ServiceProperties sP) {
4242
CasAuthenticationEntryPoint entryPoint = new CasAuthenticationEntryPoint();
43-
entryPoint.setLoginUrl("https://localhost:8443/cas/login");
43+
entryPoint.setLoginUrl("https://localhost:6443/cas/login");
4444
entryPoint.setServiceProperties(sP);
4545
return entryPoint;
4646
}
4747

4848
@Bean
4949
public TicketValidator ticketValidator() {
50-
return new Cas30ServiceTicketValidator("https://localhost:8443/cas");
50+
return new Cas30ServiceTicketValidator("https://localhost:6443/cas");
5151
}
5252

5353
@Bean
@@ -71,15 +71,15 @@ public SecurityContextLogoutHandler securityContextLogoutHandler() {
7171
@Bean
7272
public LogoutFilter logoutFilter() {
7373
LogoutFilter logoutFilter = new LogoutFilter(
74-
"https://localhost:8443/cas/logout", securityContextLogoutHandler());
74+
"https://localhost:6443/cas/logout", securityContextLogoutHandler());
7575
logoutFilter.setFilterProcessesUrl("/logout/cas");
7676
return logoutFilter;
7777
}
7878

7979
@Bean
8080
public SingleSignOutFilter singleSignOutFilter() {
8181
SingleSignOutFilter singleSignOutFilter = new SingleSignOutFilter();
82-
singleSignOutFilter.setCasServerUrlPrefix("https://localhost:8443/cas");
82+
singleSignOutFilter.setCasServerUrlPrefix("https://localhost:6443/cas");
8383
singleSignOutFilter.setIgnoreInitConfiguration(true);
8484
return singleSignOutFilter;
8585
}

‎cas/cas-server/etc/cas/thekeystore‎

-2.17 KB
Binary file not shown.

‎cas/cas-server/etc/cas/thekeystore.crt‎

-808 Bytes
Binary file not shown.

‎cas/cas-server/src/main/resources/application.properties‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
# CAS Server Context Configuration
33
#
44
server.context-path=/cas
5-
server.port=8443
5+
server.port=6443
66

7-
server.ssl.key-store=file:/etc/cas/thekeystore
7+
server.ssl.key-store=classpath:/etc/cas/thekeystore
88
server.ssl.key-store-password=changeit
99
server.ssl.key-password=changeit
1010
# server.ssl.ciphers=
@@ -40,6 +40,12 @@ spring.http.encoding.charset=UTF-8
4040
spring.http.encoding.enabled=true
4141
spring.http.encoding.force=true
4242

43+
##
44+
#CAS CONFIG LOCATION
45+
#
46+
cas.standalone.config=classpath:/etc/cas/config
47+
48+
4349
##
4450
# CAS Cloud Bus Configuration
4551
#
@@ -82,6 +88,7 @@ spring.thymeleaf.mode=HTML
8288
# CAS Log4j Configuration
8389
#
8490
# logging.config=file:/etc/cas/log4j2.xml
91+
8592
server.context-parameters.isLog4jAutoInitializationDisabled=true
8693

8794
##
@@ -104,9 +111,10 @@ cas.authn.jdbc.query[0].dialect=org.hibernate.dialect.MySQLDialect
104111
cas.authn.jdbc.query[0].user=root
105112
cas.authn.jdbc.query[0].password=
106113
cas.authn.jdbc.query[0].ddlAuto=none
107-
cas.authn.jdbc.query[0].driverClass=com.mysql.jdbc.Driver
114+
#cas.authn.jdbc.query[0].driverClass=com.mysql.jdbc.Driver
115+
cas.authn.jdbc.query[0].driverClass=com.mysql.cj.jdbc.Driver
108116
cas.authn.jdbc.query[0].fieldPassword=password
109-
cas.authn.jdbc.query[0].passwordEncoder.type=BCRYPT
117+
cas.authn.jdbc.query[0].passwordEncoder.type=NONE
110118

111119

112120
##

‎cas/cas-server/src/main/resources/cas.properties‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
1-
cas.server.name: https://localhost:8443
2-
cas.server.prefix: https://localhost:8443/cas
1+
cas.server.name: https://localhost:6443
2+
cas.server.prefix: https://localhost:643/cas
33

44
cas.adminPagesSecurity.ip=127\.0\.0\.1
55

6-
logging.config: file:/etc/cas/config/log4j2.xml
7-
86
cas.serviceRegistry.initFromJson=true
97
cas.serviceRegistry.config.location=classpath:/services
108

119
cas.authn.accept.users=
1210
cas.authn.accept.name=
1311

12+
1413
#CAS Database Authentication Property
1514

1615
# cas.authn.jdbc.query[0].healthQuery=

‎cas/cas-server/src/main/resources/etc/cas/config/application.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
info:
2+
description: CAS Configuration

‎cas/cas-server/src/main/resources/etc/cas/config/cas.properties‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
cas.server.name: https://cas.example.org:8443
2+
cas.server.prefix: https://cas.example.org:8443/cas
3+
4+
cas.adminPagesSecurity.ip=127\.0\.0\.1
5+
6+
logging.config: file:/etc/cas/config/log4j2.xml
7+
# cas.serviceRegistry.config.location: classpath:/services

‎cas/cas-server/src/main/resources/etc/cas/config/log4j2.xml‎

Lines changed: 117 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,117 @@
1+
<?xml version="1.0" encoding="UTF-8" ?>
2+
<!-- Specify the refresh internal in seconds. -->
3+
<Configuration monitorInterval="5" packages="org.apereo.cas.logging">
4+
<Properties>
5+
<!--
6+
Default log directory is the current directory but that can be overridden with -Dcas.log.dir=<logdir>
7+
Or you can change this property to a new default
8+
-->
9+
<Property name="cas.log.dir" >.</Property>
10+
<!-- To see more CAS specific logging, adjust this property to info or debug or run server with -Dcas.log.leve=debug -->
11+
<Property name="cas.log.level" >warn</Property>
12+
</Properties>
13+
<Appenders>
14+
<Console name="console" target="SYSTEM_OUT">
15+
<PatternLayout pattern="%d %p [%c] - &lt;%m&gt;%n"/>
16+
</Console>
17+
<RollingFile name="file" fileName="${sys:cas.log.dir}/cas.log" append="true"
18+
filePattern="${sys:cas.log.dir}/cas-%d{yyyy-MM-dd-HH}-%i.log">
19+
<PatternLayout pattern="%d %p [%c] - &lt;%m&gt;%n"/>
20+
<Policies>
21+
<OnStartupTriggeringPolicy />
22+
<SizeBasedTriggeringPolicy size="10 MB"/>
23+
<TimeBasedTriggeringPolicy />
24+
</Policies>
25+
</RollingFile>
26+
<RollingFile name="auditlogfile" fileName="${sys:cas.log.dir}/cas_audit.log" append="true"
27+
filePattern="${sys:cas.log.dir}/cas_audit-%d{yyyy-MM-dd-HH}-%i.log">
28+
<PatternLayout pattern="%d %p [%c] - %m%n"/>
29+
<Policies>
30+
<OnStartupTriggeringPolicy />
31+
<SizeBasedTriggeringPolicy size="10 MB"/>
32+
<TimeBasedTriggeringPolicy />
33+
</Policies>
34+
</RollingFile>
35+
36+
<RollingFile name="perfFileAppender" fileName="${sys:cas.log.dir}/perfStats.log" append="true"
37+
filePattern="${sys:cas.log.dir}/perfStats-%d{yyyy-MM-dd-HH}-%i.log">
38+
<PatternLayout pattern="%m%n"/>
39+
<Policies>
40+
<OnStartupTriggeringPolicy />
41+
<SizeBasedTriggeringPolicy size="10 MB"/>
42+
<TimeBasedTriggeringPolicy />
43+
</Policies>
44+
</RollingFile>
45+
46+
<CasAppender name="casAudit">
47+
<AppenderRef ref="auditlogfile" />
48+
</CasAppender>
49+
<CasAppender name="casFile">
50+
<AppenderRef ref="file" />
51+
</CasAppender>
52+
<CasAppender name="casConsole">
53+
<AppenderRef ref="console" />
54+
</CasAppender>
55+
<CasAppender name="casPerf">
56+
<AppenderRef ref="perfFileAppender" />
57+
</CasAppender>
58+
</Appenders>
59+
<Loggers>
60+
<!-- If adding a Logger with level set higher than warn, make category as selective as possible -->
61+
<!-- Loggers inherit appenders from Root Logger unless additivity is false -->
62+
<AsyncLogger name="org.apereo" level="${sys:cas.log.level}" includeLocation="true"/>
63+
<AsyncLogger name="org.apereo.services.persondir" level="${sys:cas.log.level}" includeLocation="true"/>
64+
<AsyncLogger name="org.apereo.cas.web.flow" level="info" includeLocation="true"/>
65+
<AsyncLogger name="org.apache" level="warn" />
66+
<AsyncLogger name="org.apache.http" level="error" />
67+
<AsyncLogger name="org.springframework" level="warn" />
68+
<AsyncLogger name="org.springframework.cloud.server" level="warn" />
69+
<AsyncLogger name="org.springframework.cloud.client" level="warn" />
70+
<AsyncLogger name="org.springframework.cloud.bus" level="warn" />
71+
<AsyncLogger name="org.springframework.aop" level="warn" />
72+
<AsyncLogger name="org.springframework.boot" level="warn" />
73+
<AsyncLogger name="org.springframework.boot.actuate.autoconfigure" level="warn" />
74+
<AsyncLogger name="org.springframework.webflow" level="warn" />
75+
<AsyncLogger name="org.springframework.session" level="warn" />
76+
<AsyncLogger name="org.springframework.amqp" level="error" />
77+
<AsyncLogger name="org.springframework.integration" level="warn" />
78+
<AsyncLogger name="org.springframework.messaging" level="warn" />
79+
<AsyncLogger name="org.springframework.web" level="warn" />
80+
<AsyncLogger name="org.springframework.orm.jpa" level="warn" />
81+
<AsyncLogger name="org.springframework.scheduling" level="warn" />
82+
<AsyncLogger name="org.springframework.context.annotation" level="error" />
83+
<AsyncLogger name="org.springframework.boot.devtools" level="error" />
84+
<AsyncLogger name="org.springframework.web.socket" level="warn" />
85+
<AsyncLogger name="org.thymeleaf" level="warn" />
86+
<AsyncLogger name="org.pac4j" level="warn" />
87+
<AsyncLogger name="org.opensaml" level="warn"/>
88+
<AsyncLogger name="net.sf.ehcache" level="warn" />
89+
<AsyncLogger name="com.couchbase" level="warn" includeLocation="true"/>
90+
<AsyncLogger name="com.ryantenney.metrics" level="warn" />
91+
<AsyncLogger name="net.jradius" level="warn" />
92+
<AsyncLogger name="org.openid4java" level="warn" />
93+
<AsyncLogger name="org.ldaptive" level="warn" />
94+
<AsyncLogger name="com.hazelcast" level="warn" />
95+
<AsyncLogger name="org.jasig.spring" level="warn" />
96+
97+
<!-- Log perf stats only to perfStats.log -->
98+
<AsyncLogger name="perfStatsLogger" level="info" additivity="false" includeLocation="true">
99+
<AppenderRef ref="casPerf"/>
100+
</AsyncLogger>
101+
102+
<!-- Log audit to all root appenders, and also to audit log (additivity is not false) -->
103+
<AsyncLogger name="org.apereo.inspektr.audit.support" level="info" includeLocation="true" >
104+
<AppenderRef ref="casAudit"/>
105+
</AsyncLogger>
106+
107+
<!-- All Loggers inherit appenders specified here, unless additivity="false" on the Logger -->
108+
<AsyncRoot level="warn">
109+
<AppenderRef ref="casFile"/>
110+
<!--
111+
For deployment to an application server running as service,
112+
delete the casConsole appender below
113+
-->
114+
<AppenderRef ref="casConsole"/>
115+
</AsyncRoot>
116+
</Loggers>
117+
</Configuration>

‎cas/cas-server/src/main/resources/etc/cas/thekeystore‎

2.19 KB
Binary file not shown.

‎cas/cas-server/src/main/resources/etc/cas/thekeystore.crt‎

885 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)