Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
S
srvpro
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nanahira
srvpro
Commits
9b2becb1
Commit
9b2becb1
authored
Oct 27, 2021
by
nanahira
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'mc'
parents
7d384e18
180a36a6
Pipeline
#6503
failed with stages
in 3 minutes and 49 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
100 additions
and
200 deletions
+100
-200
ygopro-server.coffee
ygopro-server.coffee
+38
-90
ygopro-server.js
ygopro-server.js
+62
-110
No files found.
ygopro-server.coffee
View file @
9b2becb1
...
...
@@ -18,7 +18,6 @@ _.str = require 'underscore.string'
_
.
mixin
(
_
.
str
.
exports
())
request
=
require
'request'
axios
=
require
'axios'
qs
=
require
"querystring"
zlib
=
require
'zlib'
axios
=
require
'axios'
...
...
@@ -2391,13 +2390,15 @@ ygopro.ctos_follow 'JOIN_GAME', true, (buffer, info, client, server, datas)->
return
when
4
if
settings
.
modules
.
arena_mode
.
check_permit
match_permit
=
null
try
match
_permit
=
await
axios
.
get
settings
.
modules
.
arena_mode
.
check_permit
,
match
PermitRes
=
await
axios
.
get
settings
.
modules
.
arena_mode
.
check_permit
,
responseType
:
'json'
timeout
:
3000
match_permit
=
matchPermitRes
.
data
catch
e
log
.
warn
"match permit fail
#{
e
.
toString
()
}
"
if
client
.
closed
return
if
match_permit
and
match_permit
.
permit
==
false
ygopro
.
stoc_die
(
client
,
'${invalid_password_unauthorized}'
)
return
...
...
@@ -2429,95 +2430,42 @@ ygopro.ctos_follow 'JOIN_GAME', true, (buffer, info, client, server, datas)->
room
.
join_player
(
client
)
return
_async
.
auto
({
###
match_permit: (done) ->
if client.closed
done()
return
if(!settings.modules.arena_mode.check_permit)
done(null, null)
return
request
url: settings.modules.arena_mode.check_permit,
json: true,
qs:
username: client.name,
password: info.pass,
arena: settings.modules.arena_mode.mode
, (error, response, body)->
if client.closed
done(null, null)
return
if !error and body
done(null, body)
else
log.warn("Match permit request error", error)
done(null, null)
return
return
###
get_user
:
(
done
)
->
if
client
.
closed
done
()
return
if
id
=
users_cache
[
client
.
name
]
secret
=
id
%
65535
+
1
decrypted_buffer
=
Buffer
.
allocUnsafe
(
6
)
for
i
in
[
0
,
2
,
4
]
decrypted_buffer
.
writeUInt16LE
(
buffer
.
readUInt16LE
(
i
)
^
secret
,
i
)
if
check_buffer_indentity
(
decrypted_buffer
)
done
(
null
,
{
original
:
decrypted_buffer
,
decrypted
:
decrypted_buffer
})
return
#TODO: query database directly, like preload.
request
baseUrl
:
settings
.
modules
.
mycard
.
auth_base_url
,
url
:
'/users/'
+
encodeURIComponent
(
client
.
name
)
+
'.json'
,
qs
:
api_key
:
settings
.
modules
.
mycard
.
auth_key
,
api_username
:
client
.
name
,
skip_track_visit
:
true
json
:
true
,
(
error
,
response
,
body
)
->
if
!
error
and
body
and
body
.
user
users_cache
[
client
.
name
]
=
body
.
user
.
id
secret
=
body
.
user
.
id
%
65535
+
1
decrypted_buffer
=
Buffer
.
allocUnsafe
(
6
)
for
i
in
[
0
,
2
,
4
]
decrypted_buffer
.
writeUInt16LE
(
buffer
.
readUInt16LE
(
i
)
^
secret
,
i
)
if
check_buffer_indentity
(
decrypted_buffer
)
buffer
=
decrypted_buffer
else
log
.
warn
(
"READ USER FAIL"
,
client
.
name
,
error
,
body
)
done
(
"${load_user_info_fail}"
)
return
decrypted_buffer
=
null
# buffer != decrypted_buffer ==> auth failed
if
!
check_buffer_indentity
(
buffer
)
done
(
'${invalid_password_checksum}'
)
return
done
(
null
,
{
original
:
buffer
,
decrypted
:
decrypted_buffer
})
return
return
},
(
err
,
data
)
->
if
(
client
.
closed
)
return
if
(
err
)
ygopro
.
stoc_die
(
client
,
err
)
return
create_room_with_action
(
data
.
get_user
.
original
,
data
.
get_user
.
decrypted
)
)
if
id
=
users_cache
[
client
.
name
]
secret
=
id
%
65535
+
1
decrypted_buffer
=
Buffer
.
allocUnsafe
(
6
)
for
i
in
[
0
,
2
,
4
]
decrypted_buffer
.
writeUInt16LE
(
buffer
.
readUInt16LE
(
i
)
^
secret
,
i
)
if
check_buffer_indentity
(
decrypted_buffer
)
return
create_room_with_action
(
decrypted_buffer
,
decrypted_buffer
)
try
userUrl
=
"
#{
settings
.
modules
.
mycard
.
auth_base_url
}
/users/
#{
encodeURIComponent
(
client
.
name
)
}
.json"
#console.log(userUrl)
userDataRes
=
await
axios
.
get
userUrl
,
responseType
:
'json'
timeout
:
10000
userData
=
userDataRes
.
data
#console.log userData
catch
e
log
.
warn
(
"READ USER FAIL"
,
client
.
name
,
e
.
toString
())
if
!
client
.
closed
ygopro
.
stoc_die
(
client
,
'${load_user_info_fail}'
)
return
if
client
.
closed
return
users_cache
[
client
.
name
]
=
userData
.
user
.
id
secret
=
userData
.
user
.
id
%
65535
+
1
decrypted_buffer
=
Buffer
.
allocUnsafe
(
6
)
for
i
in
[
0
,
2
,
4
]
decrypted_buffer
.
writeUInt16LE
(
buffer
.
readUInt16LE
(
i
)
^
secret
,
i
)
if
check_buffer_indentity
(
decrypted_buffer
)
buffer
=
decrypted_buffer
if
!
check_buffer_indentity
(
buffer
)
ygopro
.
stoc_die
(
client
,
'${invalid_password_checksum}'
)
return
return
create_room_with_action
(
buffer
,
decrypted_buffer
)
else
if
settings
.
modules
.
challonge
.
enabled
if
info
.
version
!=
settings
.
version
and
settings
.
alternative_versions
.
includes
(
info
.
version
)
...
...
ygopro-server.js
View file @
9b2becb1
...
...
@@ -36,8 +36,6 @@
request
=
require
(
'
request
'
);
axios
=
require
(
'
axios
'
);
qs
=
require
(
"
querystring
"
);
zlib
=
require
(
'
zlib
'
);
...
...
@@ -2965,7 +2963,7 @@
});
ygopro
.
ctos_follow
(
'
JOIN_GAME
'
,
true
,
async
function
(
buffer
,
info
,
client
,
server
,
datas
)
{
var
available_logs
,
check_buffer_indentity
,
create_room_with_action
,
d
uelLog
,
exactBan
,
index
,
j
,
l
,
len
,
len1
,
pre_room
,
recover_match
,
replay
,
replay_id
,
replays
,
room
,
struct
;
var
available_logs
,
check_buffer_indentity
,
create_room_with_action
,
d
ecrypted_buffer
,
duelLog
,
e
,
exactBan
,
i
,
id
,
index
,
j
,
l
,
len
,
len1
,
len2
,
len3
,
m
,
n
,
pre_room
,
recover_match
,
ref
,
ref1
,
replay
,
replay_id
,
replays
,
room
,
secret
,
struct
,
userData
,
userDataRes
,
userUrl
;
//log.info info
info
.
pass
=
info
.
pass
.
trim
();
client
.
pass
=
info
.
pass
;
...
...
@@ -3070,7 +3068,7 @@
return
(
checksum
&
0xFF
)
===
0
;
};
create_room_with_action
=
async
function
(
buffer
,
decrypted_buffer
)
{
var
action
,
e
,
firstByte
,
len2
,
m
,
match_permit
,
name
,
opt0
,
opt1
,
opt2
,
opt3
,
options
,
player
,
ref
,
ref1
,
room
,
room_title
,
title
;
var
action
,
e
,
firstByte
,
len2
,
m
,
match
PermitRes
,
match
_permit
,
name
,
opt0
,
opt1
,
opt2
,
opt3
,
options
,
player
,
ref
,
ref1
,
room
,
room_title
,
title
;
if
(
client
.
closed
)
{
return
;
}
...
...
@@ -3151,15 +3149,19 @@
break
;
case
4
:
if
(
settings
.
modules
.
arena_mode
.
check_permit
)
{
match_permit
=
null
;
try
{
match_permit
=
(
await
axios
.
get
(
settings
.
modules
.
arena_mode
.
check_permit
,
{
responseType
:
'
json
'
matchPermitRes
=
(
await
axios
.
get
(
settings
.
modules
.
arena_mode
.
check_permit
,
{
responseType
:
'
json
'
,
timeout
:
3000
}));
match_permit
=
matchPermitRes
.
data
;
}
catch
(
error1
)
{
e
=
error1
;
log
.
warn
(
`match permit fail
${
e
.
toString
()}
`
);
}
if
(
client
.
closed
)
{
return
;
}
if
(
match_permit
&&
match_permit
.
permit
===
false
)
{
ygopro
.
stoc_die
(
client
,
'
${invalid_password_unauthorized}
'
);
return
;
...
...
@@ -3204,105 +3206,55 @@
room
.
join_player
(
client
);
}
};
_async
.
auto
({
/*
match_permit: (done) ->
if client.closed
done()
return
if(!settings.modules.arena_mode.check_permit)
done(null, null)
return
request
url: settings.modules.arena_mode.check_permit,
json: true,
qs:
username: client.name,
password: info.pass,
arena: settings.modules.arena_mode.mode
, (error, response, body)->
if client.closed
done(null, null)
return
if !error and body
done(null, body)
else
log.warn("Match permit request error", error)
done(null, null)
return
return
*/
get_user
:
function
(
done
)
{
var
decrypted_buffer
,
i
,
id
,
len2
,
m
,
ref
,
secret
;
if
(
client
.
closed
)
{
done
();
return
;
}
if
(
id
=
users_cache
[
client
.
name
])
{
secret
=
id
%
65535
+
1
;
decrypted_buffer
=
Buffer
.
allocUnsafe
(
6
);
ref
=
[
0
,
2
,
4
];
for
(
m
=
0
,
len2
=
ref
.
length
;
m
<
len2
;
m
++
)
{
i
=
ref
[
m
];
decrypted_buffer
.
writeUInt16LE
(
buffer
.
readUInt16LE
(
i
)
^
secret
,
i
);
}
if
(
check_buffer_indentity
(
decrypted_buffer
))
{
done
(
null
,
{
original
:
decrypted_buffer
,
decrypted
:
decrypted_buffer
});
return
;
}
}
//TODO: query database directly, like preload.
request
({
baseUrl
:
settings
.
modules
.
mycard
.
auth_base_url
,
url
:
'
/users/
'
+
encodeURIComponent
(
client
.
name
)
+
'
.json
'
,
qs
:
{
api_key
:
settings
.
modules
.
mycard
.
auth_key
,
api_username
:
client
.
name
,
skip_track_visit
:
true
},
json
:
true
},
function
(
error
,
response
,
body
)
{
var
len3
,
n
,
ref1
;
if
(
!
error
&&
body
&&
body
.
user
)
{
users_cache
[
client
.
name
]
=
body
.
user
.
id
;
secret
=
body
.
user
.
id
%
65535
+
1
;
decrypted_buffer
=
Buffer
.
allocUnsafe
(
6
);
ref1
=
[
0
,
2
,
4
];
for
(
n
=
0
,
len3
=
ref1
.
length
;
n
<
len3
;
n
++
)
{
i
=
ref1
[
n
];
decrypted_buffer
.
writeUInt16LE
(
buffer
.
readUInt16LE
(
i
)
^
secret
,
i
);
}
if
(
check_buffer_indentity
(
decrypted_buffer
))
{
buffer
=
decrypted_buffer
;
}
}
else
{
log
.
warn
(
"
READ USER FAIL
"
,
client
.
name
,
error
,
body
);
done
(
"
${load_user_info_fail}
"
);
return
;
}
if
(
!
check_buffer_indentity
(
buffer
))
{
done
(
'
${invalid_password_checksum}
'
);
return
;
}
done
(
null
,
{
original
:
buffer
,
decrypted
:
decrypted_buffer
});
});
decrypted_buffer
=
null
;
if
(
id
=
users_cache
[
client
.
name
])
{
secret
=
id
%
65535
+
1
;
decrypted_buffer
=
Buffer
.
allocUnsafe
(
6
);
ref
=
[
0
,
2
,
4
];
for
(
m
=
0
,
len2
=
ref
.
length
;
m
<
len2
;
m
++
)
{
i
=
ref
[
m
];
decrypted_buffer
.
writeUInt16LE
(
buffer
.
readUInt16LE
(
i
)
^
secret
,
i
);
}
},
function
(
err
,
data
)
{
if
(
client
.
closed
)
{
return
;
if
(
check_buffer_indentity
(
decrypted_buffer
))
{
return
create_room_with_action
(
decrypted_buffer
,
decrypted_buffer
);
}
if
(
err
)
{
ygopro
.
stoc_die
(
client
,
err
);
return
;
}
try
{
userUrl
=
`
${
settings
.
modules
.
mycard
.
auth_base_url
}
/users/
${
encodeURIComponent
(
client
.
name
)}
.json`
;
//console.log(userUrl)
userDataRes
=
(
await
axios
.
get
(
userUrl
,
{
responseType
:
'
json
'
,
timeout
:
10000
}));
userData
=
userDataRes
.
data
;
}
catch
(
error1
)
{
//console.log userData
e
=
error1
;
log
.
warn
(
"
READ USER FAIL
"
,
client
.
name
,
e
.
toString
());
if
(
!
client
.
closed
)
{
ygopro
.
stoc_die
(
client
,
'
${load_user_info_fail}
'
);
}
return
create_room_with_action
(
data
.
get_user
.
original
,
data
.
get_user
.
decrypted
);
});
return
;
}
if
(
client
.
closed
)
{
return
;
}
users_cache
[
client
.
name
]
=
userData
.
user
.
id
;
secret
=
userData
.
user
.
id
%
65535
+
1
;
decrypted_buffer
=
Buffer
.
allocUnsafe
(
6
);
ref1
=
[
0
,
2
,
4
];
for
(
n
=
0
,
len3
=
ref1
.
length
;
n
<
len3
;
n
++
)
{
i
=
ref1
[
n
];
decrypted_buffer
.
writeUInt16LE
(
buffer
.
readUInt16LE
(
i
)
^
secret
,
i
);
}
if
(
check_buffer_indentity
(
decrypted_buffer
))
{
buffer
=
decrypted_buffer
;
}
if
(
!
check_buffer_indentity
(
buffer
))
{
ygopro
.
stoc_die
(
client
,
'
${invalid_password_checksum}
'
);
return
;
}
return
create_room_with_action
(
buffer
,
decrypted_buffer
);
}
else
if
(
settings
.
modules
.
challonge
.
enabled
)
{
if
(
info
.
version
!==
settings
.
version
&&
settings
.
alternative_versions
.
includes
(
info
.
version
))
{
info
.
version
=
settings
.
version
;
...
...
@@ -3334,7 +3286,7 @@
});
}
},
async
function
(
err
,
datas
)
{
var
create_room_name
,
found
,
k
,
match
,
ref
,
ref1
,
room
,
user
;
var
create_room_name
,
found
,
k
,
match
,
ref
2
,
ref3
,
room
,
user
;
if
(
client
.
closed
)
{
return
;
}
...
...
@@ -3344,9 +3296,9 @@
return
;
}
found
=
false
;
ref
=
datas
.
participant_data
;
for
(
k
in
ref
)
{
user
=
ref
[
k
];
ref
2
=
datas
.
participant_data
;
for
(
k
in
ref
2
)
{
user
=
ref
2
[
k
];
if
(
user
.
participant
&&
user
.
participant
.
name
&&
deck_name_match
(
user
.
participant
.
name
,
client
.
name
))
{
found
=
user
.
participant
;
break
;
...
...
@@ -3358,9 +3310,9 @@
}
client
.
challonge_info
=
found
;
found
=
false
;
ref
1
=
datas
.
match_data
;
for
(
k
in
ref
1
)
{
match
=
ref
1
[
k
];
ref
3
=
datas
.
match_data
;
for
(
k
in
ref
3
)
{
match
=
ref
3
[
k
];
if
(
match
&&
match
.
match
&&
!
match
.
match
.
winnerId
&&
match
.
match
.
state
!==
"
complete
"
&&
match
.
match
.
player1Id
&&
match
.
match
.
player2Id
&&
(
match
.
match
.
player1Id
===
client
.
challonge_info
.
id
||
match
.
match
.
player2Id
===
client
.
challonge_info
.
id
))
{
found
=
match
.
match
;
break
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment