Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
SpoCCify Backend
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
SpoCCify
SpoCCify Backend
Commits
5b44598b
Commit
5b44598b
authored
2 years ago
by
Falk Rehse
Browse files
Options
Downloads
Patches
Plain Diff
Rename secret to token
parent
cb4607df
No related branches found
No related tags found
No related merge requests found
Pipeline
#115624
passed
2 years ago
Stage: build
Changes
1
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/main.rs
+16
-16
16 additions, 16 deletions
src/main.rs
with
16 additions
and
16 deletions
src/main.rs
+
16
−
16
View file @
5b44598b
...
@@ -24,13 +24,13 @@ fn main() {
...
@@ -24,13 +24,13 @@ fn main() {
let
playlist_1
=
Mutable
::
clone
(
&
playlist
);
let
playlist_1
=
Mutable
::
clone
(
&
playlist
);
spawn
(
move
||
{
spawn
(
move
||
{
let
player_
secret
=
Arc
::
new
(
let
player_
token
=
Arc
::
new
(
env
::
var
(
"SPOCCIFY_PLAYER_
SECRET
"
)
env
::
var
(
"SPOCCIFY_PLAYER_
TOKEN
"
)
.expect
(
"No player
secret
provided!"
),
.expect
(
"No player
token
provided!"
),
);
);
let
client_
secret
=
Arc
::
new
(
let
client_
token
=
Arc
::
new
(
env
::
var
(
"SPOCCIFY_CLIENT_
SECRET
"
)
env
::
var
(
"SPOCCIFY_CLIENT_
TOKEN
"
)
.expect
(
"No client
secret
provided!"
),
.expect
(
"No client
token
provided!"
),
);
);
let
bind_host
=
let
bind_host
=
...
@@ -45,14 +45,14 @@ fn main() {
...
@@ -45,14 +45,14 @@ fn main() {
let
server
=
TcpListener
::
bind
(
bind_address
)
.expect
(
"Failed to bind websocket port!"
);
let
server
=
TcpListener
::
bind
(
bind_address
)
.expect
(
"Failed to bind websocket port!"
);
for
stream
in
server
.incoming
()
{
for
stream
in
server
.incoming
()
{
let
playlist_clone
=
Mutable
::
clone
(
&
playlist_1
);
let
playlist_clone
=
Mutable
::
clone
(
&
playlist_1
);
let
player_
secret
_clone
=
Arc
::
clone
(
&
player_
secret
);
let
player_
token
_clone
=
Arc
::
clone
(
&
player_
token
);
let
client_
secret
_clone
=
Arc
::
clone
(
&
client_
secret
);
let
client_
token
_clone
=
Arc
::
clone
(
&
client_
token
);
spawn
(
move
||
{
spawn
(
move
||
{
handle_websocket
(
handle_websocket
(
stream
,
stream
,
playlist_clone
,
playlist_clone
,
player_
secret
_clone
,
player_
token
_clone
,
client_
secret
_clone
,
client_
token
_clone
,
)
)
});
});
}
}
...
@@ -71,8 +71,8 @@ fn main() {
...
@@ -71,8 +71,8 @@ fn main() {
fn
handle_websocket
(
fn
handle_websocket
(
stream
:
Result
<
TcpStream
,
Error
>
,
stream
:
Result
<
TcpStream
,
Error
>
,
playlist
:
Mutable
<
Vec
<
Song
>>
,
playlist
:
Mutable
<
Vec
<
Song
>>
,
player_
secret
:
Arc
<
String
>
,
player_
token
:
Arc
<
String
>
,
client_
secret
:
Arc
<
String
>
,
client_
token
:
Arc
<
String
>
,
)
->
()
{
)
->
()
{
if
let
Err
(
_
)
=
stream
{
if
let
Err
(
_
)
=
stream
{
eprintln!
(
"Failed to accept TCP stream!"
);
eprintln!
(
"Failed to accept TCP stream!"
);
...
@@ -94,9 +94,9 @@ fn handle_websocket(
...
@@ -94,9 +94,9 @@ fn handle_websocket(
let
msg
=
msg
.unwrap
();
let
msg
=
msg
.unwrap
();
if
let
Message
::
Text
(
text
)
=
msg
{
if
let
Message
::
Text
(
text
)
=
msg
{
if
text
==
*
player_
secret
{
if
text
==
*
player_
token
{
player
::
handle_player
(
&
mut
websocket
,
&
playlist
);
player
::
handle_player
(
&
mut
websocket
,
&
playlist
);
}
else
if
text
==
*
client_
secret
{
}
else
if
text
==
*
client_
token
{
client
::
handle_client
(
&
mut
websocket
,
&
playlist
);
client
::
handle_client
(
&
mut
websocket
,
&
playlist
);
}
else
{
}
else
{
eprintln!
(
"Invalid authentication token!"
);
eprintln!
(
"Invalid authentication token!"
);
...
@@ -104,8 +104,8 @@ fn handle_websocket(
...
@@ -104,8 +104,8 @@ fn handle_websocket(
}
}
/* match text {
/* match text {
*player_
secret
=> player::handle_player(&mut websocket, &playlist),
*player_
token
=> player::handle_player(&mut websocket, &playlist),
*client_
secret
=> client::handle_client(&mut websocket, &playlist),
*client_
token
=> client::handle_client(&mut websocket, &playlist),
_ => {
_ => {
eprintln!("Invalid authentication token!");
eprintln!("Invalid authentication token!");
return;
return;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment