Skip to content

Fix authentication in restapi #4383

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lguohan merged 5 commits into from
Apr 15, 2020
Merged

Fix authentication in restapi #4383

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8cd7fb9
Fixes to restapi code
Apr 7, 2020
7ebc5b9
Update sonic-restapi commit
Apr 7, 2020
b1762eb
Address review comments
Apr 9, 2020
2de7368
Changing while loop
Apr 10, 2020
0fc3187
Open port 8090 for http server
Apr 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions dockers/docker-sonic-restapi/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ RUN apt-get update
## Clean up
RUN apt-get clean -y; apt-get autoclean -y; apt-get autoremove -y

COPY ["start.sh", "/usr/bin/"]
COPY ["supervisord.conf", "/etc/supervisor/conf.d/"]

ENTRYPOINT ["/usr/bin/supervisord"]
12 changes: 11 additions & 1 deletion dockers/docker-sonic-restapi/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,14 @@ rm -f /var/run/rsyslogd.pid

supervisorctl start rsyslogd

supervisorctl start restapi
SERVER_CERT=/etc/sonic/certificates/restapiserver.crt
SERVER_KEY=/etc/sonic/certificates/restapiserver.key
CLIENT_CERT=/etc/sonic/certificates/restapiclient.crt

while [ : ]
do
if [[ -f $SERVER_CERT && -f $SERVER_KEY && -f $CLIENT_CERT ]]; then
supervisorctl start restapi
fi
sleep 5s
done
24 changes: 20 additions & 4 deletions dockers/docker-sonic-restapi/supervisord.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,26 @@ logfile_maxbytes=1MB
logfile_backups=2
nodaemon=true

[program:restapi]
command=/usr/sbin/go-server-server -loglevel trace
[program:start.sh]
command=/usr/bin/start.sh
priority=1
autostart=true
autorestart=true
stdout_logfile=syslog
stderr_logfile=syslog

[program:restapi]
command=/usr/sbin/go-server-server -enablehttps=true -clientcert=/etc/sonic/certificates/restapiclient.crt -servercert=/etc/sonic/certificates/restapiserver.crt -serverkey=/etc/sonic/certificates/restapiserver.key -loglevel=trace
priority=1
autostart=false
autorestart=false
stdout_logfile=/tmp/rest-api.out.log
stderr_logfile=/tmp/rest-api.err.log
stdout_logfile=syslog
stderr_logfile=syslog

[program:rsyslogd]
command=/usr/sbin/rsyslogd -n
priority=2
autostart=false
autorestart=unexpected
stdout_logfile=syslog
stderr_logfile=syslog
3 changes: 2 additions & 1 deletion rules/docker-restapi.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,5 @@ endif
$(DOCKER_RESTAPI)_CONTAINER_NAME = restapi
$(DOCKER_RESTAPI)_RUN_OPT += --cap-add NET_ADMIN --privileged -t
$(DOCKER_RESTAPI)_RUN_OPT += -v /var/run/redis/redis.sock:/var/run/redis/redis.sock
$(DOCKER_RESTAPI)_RUN_OPT += -p=8090:8090/tcp
$(DOCKER_RESTAPI)_RUN_OPT += -v /etc/sonic/certificates:/etc/sonic/certificates:ro
$(DOCKER_RESTAPI)_RUN_OPT += -p=8081:8081/tcp
2 changes: 1 addition & 1 deletion src/sonic-restapi
Open in desktop
Submodule sonic-restapi updated from 163ee2 to c219e3