Add new protocol by zhkufish · Pull Request #65 · haxpor/Potatso

zhkufish · 2018-01-09T15:11:30Z

"auth_sha1_v4",
"auth_aes128_md5",
"auth_aes128_sha1"

"auth_aes128_md5", "auth_aes128_sha1" add protocol

haxpor · 2018-01-09T15:33:18Z

.gitmodules

 [submodule "Library/ShadowPath/ShadowPath/shadowsocks-libev"]
 	path = Library/ShadowPath/ShadowPath/shadowsocks-libev
-	url = git@github.com:icodesign/shadowsocks-libev.git
+	url = Library/ShadowPath/ShadowPath/shadowsocks-libev.git


Something wrong here. It should be remote github url, not the local one.

Thank you, I will fix it.

haxpor · 2018-01-09T15:40:59Z

Potatso/AppInitializer.swift

-        logglyLogger.logFormatter = formatter
-        DDLog.add(logglyLogger)
+//        let logglyLogger = LogglyLogger() // Loggy Logger
+//        logglyLogger.logglyKey = "107d98a8-c275-4369-a881-b36d3564c9ef"


What happens here. I think this PR should not involve touching too many thing. LogglyLogger can be left intact, and code before changed grabs api key from Info.plist nicely, no need to hardcoded.

I think this part should not be commented or removed out.

What's the problem you're facing if not commenting those lines?

I don't know to use LogglyLogger. I had register an account in "loggly.com". I use customer token replace the logglyKey. But it had a connection error when I run Potatso. So I remove it.

Today, I try again, It seems normally.
Suspending, posting logs to Loggly
2018-01-10 11:35:15.647177+0800 Potatso[1576:769317] Posting to Loggly: {"rawlogmessage":

Is it working before before you made change? InfoInternal will grab API key from Info.plist automatically.

Anyway, in future I think we can remove it as developer will build their own app and change API key anyway.

haxpor · 2018-01-09T15:42:13Z

Potatso/AppInitializer.swift

-        HelpshiftCore.initialize(with: HelpshiftAll.sharedInstance())
-        HelpshiftCore.install(forApiKey: HELPSHIFT_KEY, domainName: HELPSHIFT_DOMAIN, appID: HELPSHIFT_ID)
-    }
+//    func configHelpShift() {


I thought about removing HelpShift as well. I will see how we will proceed this i.e cherry pick commits, or else.

haxpor · 2018-01-09T15:43:45Z

Potatso/Core/CloudSetManager.swift

-                    response.result.error?.log("Fail to update ruleset details")
-                }
-            }
+//            API.updateRuleSetListDetail(uuidsArray) { (response) in


Just note, if you don't need any code, just remove it, no need to comment them out like this.

But we should include code in CloudSetManager as for later we will do #62 .
So I think, better to leave code in CloudSetManager.swift intact, not remove them yet.

OK. Rarely used git. We use svn in out company. This is my first pull requests in github. it make some mistake.

haxpor · 2018-01-09T15:48:07Z

PotatsoBase/Potatso.m

    // very curious why grabbing value from Info.plist will result in cannot connect to VPN all the time
    // it needs to be fixed like this as always
-    return @"group.io.wasin.potatso";
+    return @"group.com.aiyuangong.Aiyuangong";


I'm wondering what's the best approach for future going forward to allow contributors to contribute that it needs to change domain in order to successfully build like this. Without making changes to repo.

If you have any idea for best approach to do that, feel free to let me know.

BTW: Can you build the project by not changing the bundle id, or group identifier on your machine?

No. I can't build without change bundle id. It seems to have to use paid apple developer when you use NetworkExtension.

Ok, thank you for letting me know.
I will think about cleaner way not to pollute changes every time others push commit later.

haxpor · 2018-01-09T15:49:15Z

PotatsoModel/Proxy.swift

+        "auth_sha1_v4",
+        "auth_aes128_md5",
+        "auth_aes128_sha1",
+        "auth_chain_a",


Can we remove these two lines for auth_chain_a and auth_chain_b as you said it doesn't support yet?

Sorry. I forgot to remove it in this file.

haxpor · 2018-01-09T15:55:14Z

Please ignore result from travis-ci, I'm not done with it yet.

haxpor · 2018-01-09T16:14:03Z

Podfile.lock

    - CallbackURLKit/Core (= 1.0.0)
  - CallbackURLKit/Core (1.0.0)
-  - Cartography (1.0.1)
+  - Cartography (3.0.1)


Are you sure Cartogrphy 3.0.1 works with Potatso?
Did you try cleaning up the project before building? Thanks

Yes, I had cleaning up before. no errors.

haxpor

More feedback regarding updating of dependencies.

zhkufish · 2018-01-10T03:56:00Z

Please ignore result from travis-ci, I'm not done with it yet. What's this? Where used?

haxpor · 2018-01-10T03:58:03Z

I mean

no need to worry about it :)

zhkufish · 2018-01-10T04:05:49Z

I had fix smoe mistake. But I can't create new pull requests. It remind this warning, "Can’t automatically merge. Don’t worry, you can still create the pull request." But I can't find any create pull reqest button

haxpor · 2018-01-10T04:14:29Z

It's ok, no need to create a new PR. Your new commits are updated with this same PR.
I'll test it out later. Thank you for your contribution!

haxpor · 2018-01-10T04:18:07Z

Potatso/AppInitializer.swift

-//        logglyLogger.logFormatter = formatter
-//        DDLog.add(logglyLogger)
+        let logglyLogger = LogglyLogger() // Loggy Logger
+        logglyLogger.logglyKey = "107d98a8-c275-4369-a881-b36d3564c9ef"


Would you please change back to this logglyLogger.logglyKey = InfoInternal.shared.getLogglyAPIKey()?

haxpor · 2018-01-10T04:28:13Z

Potatso/AppInitializer.swift


        let logglyLogger = LogglyLogger() // Loggy Logger
-        logglyLogger.logglyKey = InfoInternal.shared.getLogglyAPIKey()
+        logglyLogger.logglyKey = "107d98a8-c275-4369-a881-b36d3564c9ef"


Could you please revert back to this logglyLogger.logglyKey = InfoInternal.shared.getLogglyAPIKey()?

haxpor · 2018-01-10T04:31:19Z

PotatsoModel/Proxy.swift

+        "auth_sha1_v4",
+        "auth_aes128_md5",
+        "auth_aes128_sha1",
+//        "auth_chain_a",


Please remove this line and below it.

getLogglyAPIKey from info.plist

pengxianhe · 2018-02-27T05:55:15Z

can this support protocol_param?

zhkufish added 3 commits January 9, 2018 22:37

"auth_sha1_v4",

4a758ce

"auth_aes128_md5", "auth_aes128_sha1" add protocol

change shadowsocks-libev submodule

4105849

Update submodule url.

a3a23b2

haxpor reviewed Jan 9, 2018

View reviewed changes

haxpor mentioned this pull request Jan 9, 2018

I have add some protocol, but I don't know how to push it to github. #64

Closed

haxpor reviewed Jan 9, 2018

View reviewed changes

fix gitmodules url error

2779ff9

fix some pod warning, add logglyLogger back

cdb438b

haxpor reviewed Jan 10, 2018

View reviewed changes

Update AppInitializer.swift

2a2629f

getLogglyAPIKey from info.plist

Conversation

zhkufish commented Jan 9, 2018

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

haxpor Jan 9, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

haxpor Jan 9, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

haxpor Jan 9, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

haxpor Jan 9, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

zhkufish Jan 10, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

haxpor commented Jan 9, 2018

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

haxpor left a comment

Choose a reason for hiding this comment

Uh oh!

zhkufish commented Jan 10, 2018

Uh oh!

haxpor commented Jan 10, 2018

Uh oh!

zhkufish commented Jan 10, 2018

Uh oh!

haxpor commented Jan 10, 2018

Uh oh!

haxpor Jan 10, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

pengxianhe commented Feb 27, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

haxpor Jan 9, 2018 •

edited

Loading

haxpor Jan 9, 2018 •

edited

Loading

haxpor Jan 9, 2018 •

edited

Loading

haxpor Jan 9, 2018 •

edited

Loading

zhkufish Jan 10, 2018 •

edited

Loading

haxpor Jan 10, 2018 •

edited

Loading